This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9635

mergetools: add BeyondCompare 4 for Windows
ClosedPublic

Authored by mharbison72 on Dec 19 2020, 2:11 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdbc462e34e92: mergetools: add BeyondCompare 4 for Windows
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Dec 19 2020, 2:11 AM
pulkit accepted this revision.Dec 21 2020, 6:53 AM
This revision is now accepted and ready to land.Dec 21 2020, 6:53 AM
mharbison72 added a commit: rHGdbc462e34e92: mergetools: add BeyondCompare 4 for Windows.Dec 21 2020, 1:36 PM
Closed by commit rHGdbc462e34e92: mergetools: add BeyondCompare 4 for Windows (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/defaultrc/mergetools.rc (10 lines)

Diff 24464

mercurial/defaultrc/mergetools.rc

beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo beyondcompare3.args=$local $other $base $output /ro /lefttitle=$labellocal /centertitle=$labelbase /righttitle=$labelother /automerge /reviewconflicts /solo
beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child beyondcompare3.diffargs=/lro /lefttitle=$plabel1 /righttitle=$clabel /solo /expandall $parent $child
beyondcompare3.gui=True beyondcompare3.gui=True
beyondcompare3.priority=-2 beyondcompare3.priority=-2
beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3 beyondcompare3.regkeyalt=Software\Wow6432Node\Scooter Software\Beyond Compare 3
beyondcompare3.regname=ExePath 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.args=-nosplash -merge -title1=$labellocal -title2=merged -title3=$labelother $local $base $other -result=$output
diffmerge.check=changed diffmerge.check=changed
diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child diffmerge.diffargs=--nosplash --title1=$plabel1 --title2=$clabel $parent $child
diffmerge.gui=True diffmerge.gui=True
diffmerge.priority=-7 diffmerge.priority=-7
diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\ diffmerge.regkey=Software\SourceGear\SourceGear DiffMerge\
diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\ diffmerge.regkeyalt=Software\Wow6432Node\SourceGear\SourceGear DiffMerge\
diffmerge.regname=Location diffmerge.regname=Location