Kaleidoscope is def (pun intended) the prettiest diff'ing tool, but it is very sluggish on 1000+ line files. In those cases I use CompareMerge.