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