Configure TortoiseHg
- SourceGear DiffMerge integration
- Source: http://mercurial.selenic.com/wiki/DiffMerge
- Add the following to the .hgrc or Mercurial.ini file:
[ui]
merge = diffmerge
[extensions]
hgext.extdiff =
[extdiff]
cmd.diffmerge = <path-to-diffmerge-executable>
[merge-tools]
diffmerge.executable = <path-to-diffmerge-executable>
diffmerge.args = --result=$output -t1="Local Version" -t2=$output -t3="Other Version" --caption=$output $local $base $other
diffmerge.binary = False
diffmerge.symlinks = False
diffmerge.gui = True
diffmerge.premerge = True
page revision: 2, last edited: 14 Jul 2010 10:43
