Mercurial > hg-stable
changeset 46171:dbc462e34e92
mergetools: add BeyondCompare 4 for Windows
This is a copy of the TortoiseHg configuration, but dropping the 3-way diff and
dirdiff settings (since those aren't supported in core Mercurial), and swapping
the 'parent1', 'parent2', and 'base' literals for `$labellocal`, `$labelother,
and `$labelbase` respectively. (That functionality was apparently never ported
to TortoiseHg.)
Additionally, the single quotes were removed from around these arguments, since
none of the other configs have them.
Differential Revision: https://phab.mercurial-scm.org/D9635
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 19 Dec 2020 01:42:51 -0500 |
| parents | 968766c1a324 |
| children | d04c0e494cfe |
| files | mercurial/defaultrc/mergetools.rc |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/defaultrc/mergetools.rc Sat Dec 19 01:19:02 2020 -0500 +++ b/mercurial/defaultrc/mergetools.rc Sat Dec 19 01:42:51 2020 -0500 @@ -44,6 +44,16 @@ beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3 beyondcompare3.regname=ExePath +; Windows version of BeyondCompare 4 +beyondcompare4.args=$local $other $base /mergeoutput=$output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /outputtitle=merged /automerge /reviewconflicts /solo +beyondcompare4.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child +beyondcompare4.gui=True +beyondcompare4.premerge=False +beyondcompare4.priority=-1 +beyondcompare4.regkey=Software\Scooter Software\Beyond Compare 4 +beyondcompare4.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 4 +beyondcompare4.regname=ExePath + diffmerge.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output diffmerge.check=changed diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child