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
>