News for hackers. Stuff that matters.
Re:The largest Git repo by malnourish on Wednesday May 24, 2017 @02:40PM (#14412371)
For 3 way merging, I've had good luck with beyondcompare

There are no comments on this comment yet.