Mercurial > hg
comparison mercurial/defaultrc/__init__.py @ 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 | 1390bb81163e |
children |
comparison
equal
deleted
inserted
replaced
46170:968766c1a324 | 46171:dbc462e34e92 |
---|