This is an archive of the discontinued Mercurial Phabricator instance.

mergetools: add BeyondCompare 4 for Windows
ClosedPublic

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

Details

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
This revision was automatically updated to reflect the committed changes.