Okay I'll set up a profile of my editor to match what you use
On Nov 12, 2013 1:55 PM, "Tanguy Krotoff" <notifications@github.com> wrote:

> In jquery.simplecolorpicker.js:
>
> > @@ -43,7 +43,14 @@
> >                       + ' role="button" tabindex="0">'
> >                       + '</span>').insertAfter(self.$select);
> >          self.$icon.on('click.' + self.type, $.proxy(self.showPicker, self));
> > -
> > +		self.$icon.on('keydown.' + self.type, function(e) {
>
> GitHub displays the final merge :) All the comments displayed here are on
> the final diff.
> You think the formatting is the same probably because your text editor/IDE
> is configured to represent tabs with 4 spaces. If you set the tabs to
> another value, it will be more obvious the formatting is broken.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/tkrotoff/jquery-simplecolorpicker/pull/19/files#r7602258>
> .
>