Beyond Compare
Comprehensive file and folder management tool with comparison, synchronization, merging, source control, and 3-way merge for local, cloud, and FTP storage.
Website25WinMerge 2011
Easily compare and merge files with our powerful application, without the need for additional dependencies.