I know that works and it looks as though I'm going to have to use it. WinMerge is registered as a 3-way merge tool and, as I noted, everything is working fine when Tortoise SVN calls it as the merge tool.īeta Was this translation helpful? Give feedback. I've tried to research everywhere to see how I need to configure this command line but I just can't seem to get it right. svn-base file is then in the second path and the conflicted file with the <<<<<<<. It always comes up with the subfolder missing from the first path and the word "mine" at the end of it, although the "mine" should be in the third path. Svn.exe diff -diff-cmd %DIFF3% -x "-e -ub -fm -wl -wr -dl %tname -dm %bname -dr %yname" %theirs %base %mine -o %merged Svn.exe diff -diff-cmd %DIFF3% -x "-e -ub -fm -wl -wr -dl %tname -dm %bname -dr %yname %theirs %base %mine -o %merged"Īlso with the quotes differently positioned, to have the file references outside the -x extensions: SET DIFF3="C:\Program Files (x86)\Utils\WinMerge\WinMergeU.exe"
0 kommentar(er)
