WinMerge - WinMerge is an open source differencing and merging tool for Windows.
kdiff3 - KDiff3 is a file and directory diff and merge tool which compares and merges two or three text...
Meld - What is Meld? Meld is a visual diff and merge tool targeted at developers.
FileZilla - FileZilla is an FTP, or file transfer protocol, client. It lets individuals transfer single files or batches to a web server. For many years, FTP was the standard for website design. Read more about FileZilla.
P4Merge - A valuable tool for diagnosing continuous integration bugs, Folder Diff also measures how much code must be resolved in pending merge scenarios. Visually compare two versions using image diff within P4Merge to determine changes made.
Araxis Merge - Home of the award-winning Araxis Merge two and three-way file comparison (diff) and merging application, Araxis Find Duplicate Files, Araxis Replace In Files, and the Araxis Ketura issue tracking, project scheduling and time tracking application.