Free Diff Tool: SourceGear DiffMerge Compares Files and Directories
by David Hayden, Florida ASP.NET Developer, Tag: .NET Tools
At the most recent Sarasota .NET Developer Group Event, we got to talking about source control and I mentioned how I mainly use Subversion but have also used Vault in the past. Subversion is free and Vault has a personal ( single developer license ) that is free as well.
Going over to the SourceGear site I noticed they also have a free diff tool, called DiffMerge, that you can download. The features are mentioned as follows:
- 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.
You can learn more here.