PANDO  This is a high-end diff tool - take it from someone who's shopped for OS X diff tools for days. I own the Oro version and for $75 you get more than what the description says, plus great technical support. Between home and work I run Linux, OS X and Windows and DeltaWalker delivers on all three. A bit unconventional UI for a Mac app, yet very usable and pleasing to the eye; it just feels right. Love the in-place editing, the merging, the folder comparison right-click filters, the FTP...

Highly recommended!  
(Version 1.8.5)