Free Tools

RoaringDiff

Mac graphical "differ" that is suitable for use from the command line

s4

Perforce-style command line for Subversion