SourceGear Fortress — world-class version control and bug tracking, installs in minutes.
See Fortress's unique Line History feature in action.
DiffMerge
DiffMerge 3.3 is now available, completely free!
DiffMerge is an application to visually compare and merge files for Windows, Mac OS X and Unix.
DiffMerge in Fortress and Vault
DiffMerge was developed as the compare/merge tool for SourceGear Fortress and Vault.
Both applications include DiffMerge, and both are available for immediate download; install in minutes; and are FREE to try for 30 days (and always free for single users).
Fortress
handles Version Control, Bug Tracking, Build Integration and more for small and midsize teams.
Learn more about Fortress.
Vault is a version control tool designed to be a compelling replacement for Visual SourceSafe.
Learn more about Vault.
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.
- 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.
- International. Compatible with 42 different character encodings.
- Cross-platform. Identical feature set on Windows, Mac OS X, and Unix.
