Tortoisehg 2.0 - No external merge/diff tool
Created originally on Bitbucket by johannesrudolph (Johannes Rudolph)
Since I upgraded to tortoise hg 2.0 external diff/merge using DiffMerge does no longer work. The configuration utility correctly displays I have configured it as my merge tool, however I am unable to select diffmerge in the Resolve Conflicts window.
Here is my configuration if that helps: {{{ #!ini
Generated by TortoiseHg setting dialog
[diff] git = True
[extensions] fold = bookmarks = progress = extdiff = rebase = mq =
[ui] username = Johannes Rudolph merge = diffmerge
[extdiff] cmd.diffmerge = c:\Programme\SourceGear\DiffMerge\DiffMerge.exe
[tortoisehg] vdiff = diffmerge ui.language = en
[merge-tools] diffmerge.executable = c:\Program Files(x86)\SourceGear\DiffMerge\DiffMerge.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 }}}
Attachments: nodiff