contrib/mergetools.hgrc
changeset 7797 e48cc2315fe6
parent 7683 39ae4fb8cf17
child 7867 01bd0efef1b5
--- a/contrib/mergetools.hgrc	Sun Feb 22 23:03:42 2009 +0100
+++ b/contrib/mergetools.hgrc	Wed Feb 04 22:12:55 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
+beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo
 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
 beyondcompare3.regname=ExePath
 beyondcompare3.gui=True