Mercurial > hg
changeset 7797:e48cc2315fe6
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)
| author | Pascal Quantin <pascal.quantin@gmail.com> |
|---|---|
| date | Wed, 04 Feb 2009 22:12:55 +0100 |
| parents | 896eaa1337bf |
| children | 57fee79e5588 |
| files | contrib/mergetools.hgrc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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