News for hackers. Stuff that matters.
Re:Setting up Sublime Text 2 by tmhedberg on Tuesday April 09, 2013 @08:05PM (#5522333)
> Until Git can ignore trailing spaces as part of the merge strategy

It can:

    git merge -X ignore-space-at-eol
Re:Setting up Sublime Text 2 by lobster_johnson on Tuesday April 09, 2013 @09:59PM (#5522785)
Great, thanks!