Hacker News new | ask | show | jobs
by tzamora 4175 days ago
I like KDiff3 for osx.

http://kdiff3.sourceforge.net/

Ugly, but just works :)