Mercurial > hg-stable
changeset 7683:39ae4fb8cf17
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.
| author | Pascal Quantin <pascal.quantin@gmail.com> |
|---|---|
| date | Fri, 23 Jan 2009 23:39:28 +0100 |
| parents | 9c8bbae02e9c |
| children | ee3364d3d859 |
| files | contrib/mergetools.hgrc |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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