While the UI is a Windows-style mess, nothing beats Beyond Compare. It's far and away the most useful tool I have outside of the IDE (particularly since we use Perforce). I pine for a Mac port, even if they did nothing to clean it up visually.