1

I have set up Beyond Compare 3 as a merge tool in Subversion. I have followed all the steps outlined here (BeyondCompare documentation) and here (StackOverflow) and here.

In particular, I have verified that:

  • merge-tool-cmd points to a batch file.
  • That batch file works when I run it manually with four parameters.
  • diff-tool-cmd points to another batch file, and that one works. (svn diff uses it correctly.)

Yet when I run svn resolve and tell it to merge, I just get the useless command-line merge thingie, not BeyondCompare.

What am I doing wrong?

Community
  • 1
  • 1
Timwi
  • 65,159
  • 33
  • 165
  • 230

0 Answers0