SourceGear DiffMerge

SourceGear LLC (Freeware)

SourceGear DiffMerge is a file management utility that enables users to compare and merge files. It provides a graphical display of the changes between two files and folders, and it also automatically merges three files together. Some of its key features include the following:

• Intra-line highlighting
• Full Editing support for merged files
• Folder comparison to show the files that are present in one folder but not on the other, and vice-versa
• Show identical files and those with the same filename but different content
• Integration with Windows Explorer, which allows users to see the difference between two files without having to open the application

SourceGear DiffMerge makes use of two file window types: File Diff Windows and File Merge Windows. In the first window type, users are given a two-way view in which they can see the difference between two files, or the two versions of one file. This window type displays the difference side-by-side. Users can choose to edit the file at the right panel. The second window type provides users with a three-way view, one for each file to be compared. Users can edit the file at the center pane and merge the differences from the files on both sides. This way, users will be able to have a unified, updated version of a file.