DiffMerge 4.2
Visually compare and merge files for Windows, Mac OS X and Linux.
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.
Windows Explorer Integration
Right-click on any two files in Windows Explorer to diff them immediately.
Configurable
Rulesets and options provide for customized appearance and behavior.
Cross-platform
Identical feature set on Windows, OS X, and Linux.
System Requirements
Windows:
- 32-bit: Windows XP + SP3 or newer.
- 64-bit: Windows Vista or newer.
- 20 MB available hard disk space.
Macintosh:
- Intel CPU: OS X 10.6 (Snow Leopard) or newer.
- 20 MB available hard disk space.
Ubuntu & Mint Linux:
- Ubuntu: Intel 32- or 64-bit CPU running Ubuntu 12.04 LTS "Precise Pangolin" or newer.
- Mint: Intel 32- or 64-bit CPU running Mint 14 "Nadia" or newer. It has been tested on Mint 14, but it should also work with Mint 13 "Lisa" since it is based on Ubuntu 12.04 LTS.
- 20 MB available hard disk space.
Fedora Linux:
- Intel 32- or 64-bit CPU running Fedora 17 "Beefy Miracle" or newer.
- 20 MB available hard disk space.
