Re: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755

Re: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755

[Stefan Monnier]

> -	  (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

Re: [Emacs-diffs] trunk r117368: Merge commit for debbugs:17755

[Kelvin White]

[-- 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 --]