# HG changeset patch # User Pascal Quantin # Date 1237801725 -3600 # Node ID 01bd0efef1b5ac796b290c3d7016d0c167c2d6d5 # Parent e9d4ed761c49108493f2c1aca8afd1817b71be02 merge tools: fix typo in Beyond Compare's 3 command line Fix a typo error preventing 'base' to be displayed properly. diff -r e9d4ed761c49 -r 01bd0efef1b5 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