Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 48611:a51c522c0064
merge: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12021
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Jan 2022 15:04:55 -0800 |
| parents | eaad68294904 |
| children | 47b3fca301f8 |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Jan 18 14:57:15 2022 -0800 +++ b/mercurial/commands.py Tue Jan 18 15:04:55 2022 -0800 @@ -4914,7 +4914,7 @@ overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} with ui.configoverride(overrides, b'merge'): force = opts.get(b'force') - labels = [b'working copy', b'merge rev'] + labels = [b'working copy', b'merge rev', b'common ancestor'] return hg.merge(ctx, force=force, labels=labels)