contrib/mergetools.hgrc
changeset 7867 01bd0efef1b5
parent 7797 e48cc2315fe6
child 10486 6b354a763617
--- 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