Well if you are referring to the github diff, that's the correct diff.
If you are talking about what's showing up on your git client, then I
have no idea because I'm on a Mac.
The diff shows that many lines is mainly because all the methods are
numbered sequentially, and I inserted the BigDecimal methods in the
middle of the big block. All the lines below it obviously had to be
incremented accordingly. I could have just put the BigDecimal methods
to the end of the block but, I was just following the convention you
seemed to have set up.
Anyway, I think what you can do is instead of pulling from github,
just checkout my fork and merge to your local copy on your own
machine. If you don't like it you can always revert.
Jimmy
On Jan 18, 1:28 am, Maxime Lévesque <
maxime.leves...@gmail.com> wrote:
> I'm glad you ask Jimmy !
>
> I've been procrastinating on pulling this because I have a hard time
> understanding the change,
> I mean, I understand the intent, but I'd like to look systematically at each
> line and see what
> happended to it.
>
> I have a question for you : is it possible that git is chowing more changes
> than there are in reality :
>
>
http://stackoverflow.com/questions/861995/is-it-possible-for-git-merg...
> ?
>
> Anyhow, I will print the diff and try to mentally digest it
>
>
https://github.com/wyuenho/Squeryl/commit/4d7f8aa0bf60dc047f677329f78...
>
> Thanks