News for hackers. Stuff that matters.
Re:Mercurial developer responds to "Switch to git?" by skeletonjelly on Sunday November 17, 2013 @09:46PM (#6752194)
Or use my favourite conflict program p4merge

There are no comments on this comment yet.