merge tools: fix typo in Beyond Compare's 3 command line
authorPascal Quantin <pascal.quantin@gmail.com>
Mon, 23 Mar 2009 10:48:45 +0100
changeset 7867 01bd0efef1b5
parent 7865 e9d4ed761c49
child 7868 2b901f9b37aa
merge tools: fix typo in Beyond Compare's 3 command line Fix a typo error preventing 'base' to be displayed properly.
contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Fri Mar 20 18:49:44 2009 -0500
+++ b/contrib/mergetools.hgrc	Mon Mar 23 10:48:45 2009 +0100
@@ -51,7 +51,7 @@
 filemerge.args=-left $other -right $local -ancestor $base -merge $output
 filemerge.gui=True
 
-beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo
+beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
 beyondcompare3.regname=ExePath
 beyondcompare3.gui=True