I like KDiff3 for osx.

http://kdiff3.sourceforge.net/

Ugly, but just works :)