# HG changeset patch # User Pascal Quantin # Date 1232750368 -3600 # Node ID 39ae4fb8cf17a0a12ac862d36471afd0fa453d85 # Parent 9c8bbae02e9c4b51cc9cc0494677a1f4554cec45 Retrieve Beyond Compare's path from registry Switch from a hardcoded path to registry key to find Beyond Compare's executable. Calling BCompare.exe works fine with version 3.0.14. diff -r 9c8bbae02e9c -r 39ae4fb8cf17 contrib/mergetools.hgrc --- a/contrib/mergetools.hgrc Thu Jan 22 16:07:44 2009 +0100 +++ b/contrib/mergetools.hgrc Fri Jan 23 23:39:28 2009 +0100 @@ -51,8 +51,9 @@ filemerge.args=-left $other -right $local -ancestor $base -merge $output filemerge.gui=True -beyondcompare3.executable=C:\Program Files\Beyond Compare 3\BComp.exe beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts +beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 +beyondcompare3.regname=ExePath beyondcompare3.gui=True winmerge.args=/e /u /dl local /dr other /wr $local $other $output