WinMerge -

Quickly and easily track down differences in files and merge changes between versions

(10 Users love this tool)

Submit a Link (Article, Blog, etc)