News for hackers. Stuff that matters.
Re:Git tips to stop you getting fired by edanm on Monday April 08, 2013 @05:31PM (#5514773)
Does anyone here know of a good 3-way merge tool for Git that's available on OSX?
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)