DiffMerge is an application to visually compare and merge files for Windows, Mac OS X and Unix.

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.
• FREE. Full featured. Not a demo!

Linux

• Manual
• Read Me
• DiffMerge

Mac

• DiffMerge

Windows

• Help File
• DiffMerge Installer
• DiffMerge .zip File
  (program files only, no installer)

SourceGear Vault is a version control tool for professional development teams designed to be a compelling replacement for SourceSafe.

A 30-day FREE trial download is available.

SourceGear Fortress is a cross-platform Application Lifecycle Management (ALM) solution for small and medium-sized teams.

A 30-day FREE trial download is available.