Mercurial > hg

diff contrib/mergetools.hgrc @ 7683:39ae4fb8cf17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 950484f05f16
children e48cc2315fe6
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