DiffMerge

DiffMerge 3.3

Free
DiffMerge is an application to visually compare and merge files for Windows...
 
4.2.1 (See all)

DiffMerge is an application to visually compare and merge files for Windows, Mac OS X and Linux.
Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing.
Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file.
Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different.

Info updated on:

Related software

SourceGear DiffMerge
FREE
Visually compare & merge files.