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

<p>[Edit]</p>

<p>After trying all of them, for me, the SourceGear is the one I prefer.  The way to specify the DiffMerge from sourcegear is:</p>

<blockquote>
  <p>C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe  /t1="My Working Version" /t2="Repository Version" /t3="Base" /r=%merged %mine %theirs %base</p>
</blockquote>

[{'answer_id': 50376, 'author': 'DevelopingChris', 'author_id': 1220, 'author_profile': 'https://Stackoverflow.com/users/1220', 'pm_score': 2, 'selected': False, 'text': '<p><a href="http://www.grigsoft.com/wincmp3.htm" rel="nofollow noreferrer">CompareIt</a> 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.</p>\n'}, {'answer_id': 50392, 'author': 'Alistair Sutherland', 'author_id': 4000, 'author_profile': 'https://Stackoverflow.com/users/4000', 'pm_score': 6, 'selected': False, 'text': '<p><a href="https://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools" rel="noreferrer">Perforce Merge Tool</a> </p>\n\n<p>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:</p>\n\n<blockquote>\n  <p>C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged</p>\n</blockquote>\n'}, {'answer_id': 50397, 'author': 'Erin Dees', 'author_id': 3462, 'author_profile': 'https://Stackoverflow.com/users/3462', 'pm_score': 3, 'selected': False, 'text': '<p>I use <a href="http://kdiff3.sourceforge.net/" rel="noreferrer">KDiff3</a> as a 3-way merge tool.  It does a decent job.</p>\n'}, {'answer_id': 50407, 'author': 'Chris Upchurch', 'author_id': 2600, 'author_profile': 'https://Stackoverflow.com/users/2600', 'pm_score': 6, 'selected': True, 'text': '<p>Take a look at <a href="http://www.sourcegear.com/diffmerge/" rel="nofollow noreferrer">Sourcegear DiffMerge</a>. 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.</p>\n\n<p><strong>Edit:</strong> 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:</p>\n\n<blockquote>\n  <p>Select new features in future releases will also require registration,\n  but core features and fixes will be available to everyone.</p>\n</blockquote>\n'}, {'answer_id': 50410, 'author': 'Jurney', 'author_id': 2642, 'author_profile': 'https://Stackoverflow.com/users/2642', 'pm_score': 3, 'selected': False, 'text': '<p><a href="http://www.araxis.com/merge/index.html" rel="noreferrer">Araxis Merge</a> 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.</p>\n'}, {'answer_id': 50431, 'author': 'Community', 'author_id': -1, 'author_profile': 'https://Stackoverflow.com/users/-1', 'pm_score': 5, 'selected': False, 'text': '<p><a href="http://www.scootersoftware.com/" rel="noreferrer">Beyond Compare</a> has been suggested a number of times to me.</p>\n'}, {'answer_id': 14430892, 'author': 'manuc66', 'author_id': 77135, 'author_profile': 'https://Stackoverflow.com/users/77135', 'pm_score': 0, 'selected': False, 'text': '<p>I like this one <a href="http://www.syntevo.com/smartsynchronize/index.html" rel="nofollow">SmartSynchronize</a> which is free for non-commercial use</p>\n'}]
['https://Stackoverflow.com/questions/50371', 'https://Stackoverflow.com', 'https://Stackoverflow.com/users/3798/']