Better Merge Tool for Subversion
SvnTortoisesvnSvn Problem Overview
Is there a good external merge tool for tortoisesvn (I don't particularly like the built in Merge tool). I use WinMerge for diffs, but it doesn't work with the three way merge (maybe a better question would be is there a way to force tortoisesvn to merge like tortoisecvs?)
[Edit]
After trying all of them, for me, the SourceGear is the one I prefer. The way to specify the DiffMerge from sourcegear is:
> C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe /t1="My Working Version" /t2="Repository Version" /t3="Base" /r=%merged %mine %theirs %base
Svn Solutions
Solution 1 - Svn
Even though Perforce is obviously not free the merge tool is. It's 100x better than the default TortoiseSvn one. To integrate with TortoiseSvn set the merge tool to:
> C:\Path-To\P4Merge.exe %base %theirs %mine %merged
Solution 2 - Svn
Take a look at Sourcegear DiffMerge. DiffMerge is the compare and merge tool from their Vault and Fortress products, but they make it available for free as a standalone tool. One noteworthy feature is that it allows diffing of entire directory trees.
Edit: While DiffMerge remains a free tool, it nags for registration with a popup at least once a day (since at least version 4.2). It also states in the popup:
> Select new features in future releases will also require registration, > but core features and fixes will be available to everyone.
Solution 3 - Svn
Beyond Compare has been suggested a number of times to me.
Solution 4 - Svn
I use KDiff3 as a 3-way merge tool. It does a decent job.
Solution 5 - Svn
Araxis Merge is expensive, but great. Handles 3 way merges on files or folders really well. I find the way it displays diffs much more helpful than Windiff or P4's tool.
Solution 6 - Svn
CompareIt is good, I find using the command line interface for svn, that it merges more for me, where tortoise picks up on things and asks you.
Solution 7 - Svn
I like this one SmartSynchronize which is free for non-commercial use