Mercurial > hg
comparison contrib/mergetools.hgrc @ 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 | 39ae4fb8cf17 |
| children | 01bd0efef1b5 |
comparison
equal
deleted
inserted
replaced
| 7796:896eaa1337bf | 7797:e48cc2315fe6 |
|---|---|
| 49 | 49 |
| 50 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge | 50 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
| 51 filemerge.args=-left $other -right $local -ancestor $base -merge $output | 51 filemerge.args=-left $other -right $local -ancestor $base -merge $output |
| 52 filemerge.gui=True | 52 filemerge.gui=True |
| 53 | 53 |
| 54 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts | 54 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo |
| 55 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 | 55 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 |
| 56 beyondcompare3.regname=ExePath | 56 beyondcompare3.regname=ExePath |
| 57 beyondcompare3.gui=True | 57 beyondcompare3.gui=True |
| 58 | 58 |
| 59 winmerge.args=/e /u /dl local /dr other /wr $local $other $output | 59 winmerge.args=/e /u /dl local /dr other /wr $local $other $output |