From: Kelvin White <kelvin.white77@gmail.com>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755
Date: Thu, 19 Jun 2014 14:58:25 -0400 [thread overview]
Message-ID: <CAG-q9=a6vArfLtAuGxmx+fU+ZqcD+0RQZwE0jW-sNbXedbdq6Q@mail.gmail.com> (raw)
In-Reply-To: <jwvbntoybvl.fsf-monnier+emacsdiffs@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 881 bytes --]
Ok, sure. Sorry about that
On Jun 19, 2014 2:51 PM, "Stefan Monnier" <monnier@iro.umontreal.ca> wrote:
> > - (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
>
[-- Attachment #2: Type: text/html, Size: 1429 bytes --]
prev parent reply other threads:[~2014-06-19 18:58 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 ` [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755 Stefan Monnier
2014-06-19 18:58 ` Kelvin White [this message]
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='CAG-q9=a6vArfLtAuGxmx+fU+ZqcD+0RQZwE0jW-sNbXedbdq6Q@mail.gmail.com' \
--to=kelvin.white77@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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.