DiffMerge is an application that allows you to visually compare and merge files.

DiffMerge enables you to perform three crucial tasks:

· Compare two files side-by-side and see their differences. Normally this is used to compare two different versions of a file and see how the file has changed.
· Compare three files side-by-side-by-side. Normally this is used to merge the changes from two independent (branched) versions into one file based upon a common ancestor version.
· Compare two folders side-by-side. Each file in each folder is shown to be different, identical, or without a match in the other folder.

Here are some key features of "SourceGear DiffMerge":

· 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 file.
· Folder Diff. 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.
· Configurable. Rulesets and options provide for customized appearance and behavior.
· International. Compatible with 42 different character encodings.


Requirements:

· 1.5 GHz CPU or better
· 512 MB RAM
· 20 MB available hard disk space