News for hackers. Stuff that matters.
Re:Git tips to stop you getting fired by Aga on Monday April 08, 2013 @07:48PM (#5515498)
KDiff3 has worked nice for me and it seems to be availabe for OS X too: http://kdiff3.sourceforge.net/

(however I have not tested it on an OS X)

There are no comments on this comment yet.