Comment on DiffMerge

The file comparison works really, really well, better than a lot of expensive tools that I have tried. I keep coming back to DiffMerge even though the UI looks so simple and boring.
I sometimes use it in combination with VisualDiffer (Mac, App Store) or ExamDiff (Windows, Freeware) to get a more traditional look.