Skip to content

Instantly share code, notes, and snippets.

@yantonov

yantonov/tortoisemerge-for-tortoisehg.md

Created April 9, 2014 10:11
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save yantonov/10250680 to your computer and use it in GitHub Desktop.
Save yantonov/10250680 to your computer and use it in GitHub Desktop.
Download ZIP
how to install tortoisemerge to torgoisehg
Raw
tortoisemerge-for-tortoisehg.md

how to install tortoisemerge to torgoisehg

Install latest tortoiseSVN (tortoise merge is included).

Assumed TortoiseSVN is installed to C:\Program Files\TortoiseSVN\

Edit .hgrc

[extdiff]
cmd.tortoisemerge = C:\Program Files\TortoiseSVN\bin\TortoiseMerge.exe

[merge-tools]
tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
tortoisemerge.regkey=Software\TortoiseSVN
tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
tortoisemerge.checkchanged=True
tortoisemerge.gui=True
tortoisemerge.priority=-8
tortoisemerge.diffargs=/base:$parent /mine:$child /basename:'$plabel1' /minename:'$clabel'

[ui]
merge = tortoisemerge

[tortoisehg]
vdiff = tortoisemerge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment