This tool lets me compare and merge anything I ever needed. And it provides a clean and intuitive user interface. Looking back at the free tools that come with TortoiseSVN or TortoiseGit, I can't understand how anybody would want those.
Can compare remote directories
3-way text merge
Supports binary comparison, both for checking if files are the same, but also in side-by-side hex-editor mode