DiffMerge
DiffMerge is an application to visually compare and merge files for Windows, Mac OS X and Unix.
Features :
Diff. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing.
Merge. Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting […]

















































