Simply add the following to your mercurial.ini("C:\Users\yourusername\Mercurial.ini") file:
[extensions]
hgext.extdiff =
[extdiff]
cmd.vdiff = C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
[merge-tools]
filemerge.executable = C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe
filemerge.args = /base:$base /theirs:$other /mine:$local /merged:$output
No comments:
Post a Comment