Comment on Araxis Merge

Integration with time machine is very nice. Right click on a file in the finder, select a previous version, and it opens in a diff window.

Expensive, but you get a solid, fast, quality app.