Skip to content

Instantly share code, notes, and snippets.

@IgorInger
Last active August 29, 2015 14:05
Show Gist options
  • Save IgorInger/4ed4f44753e8f485ca46 to your computer and use it in GitHub Desktop.
Save IgorInger/4ed4f44753e8f485ca46 to your computer and use it in GitHub Desktop.
[ui]
username = Igor Inger
merge = diffmerge
[extensions]
color=
purge=
hgext.extdiff=
histedit =
[extdiff]
cmd.diffmerge = C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
[merge-tools]
diffmerge.executable = C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe
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
[tortoisehg]
ui.language = en
autoresolve = True
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment