equal
deleted
inserted
replaced
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', |