from Hacker News

The best diff tool for OS X is IntelliJ?

by wpnx on 1/9/15, 7:51 PM with 2 comments

• by clscott on 1/9/15, 10:31 PM

  I've always been pretty happy with Diffmerge

  https://sourcegear.com/diffmerge/webhelp/sec__inst__mac.html

  Instructions for commanline use are pretty easy to find as well as setting it up as the default diff toll for git and svn

• by tzamora on 1/9/15, 7:56 PM

  I like KDiff3 for osx.

  http://kdiff3.sourceforge.net/

  Ugly, but just works :)