equal
deleted
inserted
replaced
4895 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
4895 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
4896 with ui.configoverride(overrides, b'merge'): |
4896 with ui.configoverride(overrides, b'merge'): |
4897 force = opts.get(b'force') |
4897 force = opts.get(b'force') |
4898 labels = [b'working copy', b'merge rev'] |
4898 labels = [b'working copy', b'merge rev'] |
4899 return hg.merge( |
4899 return hg.merge( |
4900 repo, |
4900 repo, node, force=force, mergeforce=force, labels=labels |
4901 node, |
|
4902 force=force, |
|
4903 mergeforce=force, |
|
4904 labels=labels, |
|
4905 ) |
4901 ) |
4906 |
4902 |
4907 |
4903 |
4908 statemod.addunfinished( |
4904 statemod.addunfinished( |
4909 b'merge', |
4905 b'merge', |