+1 for Beyond Compare! I have tried many different comparison tools and none of them come even close. BC just does it all and does it better than anyone else.

+1 for Beyond Compare! I have tried many different comparison tools and none of them come even close. BC just does it all and does it better than anyone else. File comparison, folder comparison, etc. My personal favorite is the Git mergetool integration with gives me a three-way merge (with the common ancestor). This is absolutely indispensable when trying to do complex merging and has saved me countless hours.