Better Merge Tool for Subversion

Question

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

Answer 1

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.

Answer 2

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

Answer 3

I use KDiff3 as a 3-way merge tool. It does a decent job.

Answer 4

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.

Answer 5

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.

Answer 6

Beyond Compare has been suggested a number of times to me.