Better Merge Tool for Subversion


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?)


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

Best Solution

Perforce Merge Tool

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