From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Kelvin White <kelvin.white77@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755
Date: Thu, 19 Jun 2014 14:51:07 -0400 [thread overview]
Message-ID: <jwvbntoybvl.fsf-monnier+emacsdiffs@gnu.org> (raw)
In-Reply-To: <E1Wxfha-0003FD-Fb@vcs.savannah.gnu.org> (Kelvin White's message of "Thu, 19 Jun 2014 17:00:42 +0000")
> - (const "KICK")
> - (const "NICK")
> - (const "PART")
> - (const "QUIT")
> - (const "MODE")
> - (repeat :inline t :tag "Others" (string :tag "IRC Message Type"))))
> + (const "KICK")
> + (const "NICK")
> + (const "PART")
> + (const "QUIT")
> + (const "MODE")
> + (repeat :inline t :tag "Others" (string :tag "IRC Message Type"))))
Your patch included a lot of whitespace changes. Please refrain from
changing whitespace (typically tabifying or untabifying).
It's perfectly OK to make such changes on the lines where you also
perform other changes, but elsewhere they're just a nuisance causing
spurious merge conflicts.
Stefan
next parent reply other threads:[~2014-06-19 18:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1Wxfha-0003FD-Fb@vcs.savannah.gnu.org>
2014-06-19 18:51 ` Stefan Monnier [this message]
2014-06-19 18:58 ` [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755 Kelvin White
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvbntoybvl.fsf-monnier+emacsdiffs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=kelvin.white77@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.