SourceGear DiffMerge

SourceGear DiffMerge

Free
Visually compare & merge files
 
3.3 (See all)

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. Cross-platform. Identical feature set on Windows, Mac OS X, and Unix.
What's new in this version:
Folder Window Equivalence Mode:
The Folder Window now has 3 different methods for compairing pairs of files: The original, exact (byte-for-byte) method that marks files as identical or different. A new Simple Equivlance method that can ignore whitespace and EOL characters and mark files as identical, equivalent, or different. A new Ruleset-based Equivalence method that uses some of the Ruleset settings to mark files as...