Kaleidoscope

Hands down the best file comparison and merge tool for Mac

Reviews
Discussion
I can't live without this one. I use Kaleidoscope for everything from comparing code to comparing legal documents. It also does images, entire folders, and more. Nothing else comes close.
This is super helpful when reviewing code changes before a commit. You can use it as a git difftool replacement. I've been using it for years and love it :)