Diff tool for OSX

Try installing the optional Xcode tools from your OSX install disk.
This includes a utility called FileMerge for comparing and merging
files.

After this install you'll find it here
/Developer/Applications/Utilities/FileMerge

Aaron