Adding another vote for BeyondCompare. It's not free, but it's fantastic.
I use Beyond Compare mainly for sync of folders by comparing files (sizes, dates) and not for file contents diff as such. Part of my backup strategy while copying/syncing file between windows/mac/NAS ;-)
Another vote for Beyond Compare here, 10 years service with Git.