* Re: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755
[not found] <E1Wxfha-0003FD-Fb@vcs.savannah.gnu.org>
@ 2014-06-19 18:51 ` Stefan Monnier
2014-06-19 18:58 ` Kelvin White
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Monnier @ 2014-06-19 18:51 UTC (permalink / raw
To: Kelvin White; +Cc: emacs-devel
> - (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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755
2014-06-19 18:51 ` [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755 Stefan Monnier
@ 2014-06-19 18:58 ` Kelvin White
0 siblings, 0 replies; 2+ messages in thread
From: Kelvin White @ 2014-06-19 18:58 UTC (permalink / raw
To: Stefan Monnier; +Cc: emacs-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-19 18:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[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
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.