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.
• Cross-platform. Identical feature set on Windows, Mac OS X, and Unix.

What is new in this release:

• Folder Window Equivalence Mode:

  The Folder Window now has 3 different methods for compairing pairs of files:

  1. The original, exact (byte-for-byte) method that marks files as identical or different.
  2. A new Simple Equivlance method that can ignore whitespace and EOL characters and mark files as identical, equivalent, or different.
  3. A new Ruleset-based Equivalence method that uses some of the Ruleset settings to mark files as identical, equivalent, or different.

  A new button was added to the Folder Window toolbar to show/hide equivalent files and a new page was added to the Options and Ruleset Dialogs to help you configure this.

• Added support for Fedora Linux.
• When the /result option is used, DiffMerge now exits with an exit status that reflects the state of the merge (MERGE-RESOLVED, MERGE-ABORTED, ERROR, etc.)
• Added support for saving the contents of a Folder Window to a file. This creates a UTF-8 CSV containing the rows currently displayed in the window (respecting the various Show/Hide toolbar buttons).
• Support for Explorer Integration (EI) on 64 bit Windows XP and Vista.