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...
WinMerge is an Open Source
differencing and merging tool for Windows. WinMerge can compare both
folders and files, presenting differences in a visual text format that
is...