DiffMerge is free, try it with AnkhSVN
- 📅
- 📝 150 words
- 🕙 1 minute
- 📦 .NET
- 🏷️ AnkhSVN, Subversion, TortoiseSVN
- 💬 4 responses
SourceGear, known for their Vault source control software, are giving away their three-way diff & merge tool DiffMerge for Windows, Mac and Unix.
DiffMerge has a clear interface and supports for file-type specific rule-sets that allow you to decide how to deal with white-space, line-endings, encoding etc.