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