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
http://kdiff3.sourceforge.net/
Ugly, but just works :)
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