Better Merge Tool for Subversion [closed]

Answer 1

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

Answer 2

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.

Answer 3

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

Answer 4

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 5

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 6

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.