tzamora on The best diff tool for OS X is IntelliJ? · Hackerly

Comment on The best diff tool for OS X is IntelliJ?

I like KDiff3 for osx.

http://kdiff3.sourceforge.net/

Ugly, but just works :)