Mercurial > hg
comparison mercurial/commands.py @ 48589: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 |
comparison
equal
deleted
inserted
replaced
| 48588:402a6b6173e9 | 48589:a51c522c0064 |
|---|---|
| 4912 | 4912 |
| 4913 # ui.forcemerge is an internal variable, do not document | 4913 # ui.forcemerge is an internal variable, do not document |
| 4914 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} | 4914 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
| 4915 with ui.configoverride(overrides, b'merge'): | 4915 with ui.configoverride(overrides, b'merge'): |
| 4916 force = opts.get(b'force') | 4916 force = opts.get(b'force') |
| 4917 labels = [b'working copy', b'merge rev'] | 4917 labels = [b'working copy', b'merge rev', b'common ancestor'] |
| 4918 return hg.merge(ctx, force=force, labels=labels) | 4918 return hg.merge(ctx, force=force, labels=labels) |
| 4919 | 4919 |
| 4920 | 4920 |
| 4921 statemod.addunfinished( | 4921 statemod.addunfinished( |
| 4922 b'merge', | 4922 b'merge', |