[PATCH 6 of 6] Update Beyond Compare's configuration

[Pascal Quantin]

# HG changeset patch
# User Pascal Quantin <pascal.quantin at gmail.com>
# Date 1233781975 -3600
# Node ID 5455258513797067cc49451ab962b3bd8d212b4f
# Parent  5bf0dcf5f102e054c070e4cc353e8a54cc36a643
Update Beyond Compare's configuration

If there is already a Beyond Compare's instance running when performing a merge
from Mercurial, BCompare.exe will exit immediately and the merge will fail.
Use the /solo switch to make it always wait (it will open each comparison in
it's own window instead of in tabs)

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -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