DiffMerge 3.3
DiffMerge is an application to visually compare and merge files.
Product 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 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.
WHAT’S NEW
Version 3.3:
- Folder Window Equivalence Mode
- 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. DiffMerge is still a 32 bit application and runs on 32 and 64 bit systems. However, the EI DLL which hooks into Windows Explorer must be the same bit-ness as the platform. This release contains 2 versions of the DLL.
REQUIREMENTS
Mac OS X 10.3.9 or later.
