1495 origctx.description().split(b"\n", 1)[0])) |
1495 origctx.description().split(b"\n", 1)[0])) |
1496 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')} |
1496 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')} |
1497 with ui.configoverride(overrides, b'pick'): |
1497 with ui.configoverride(overrides, b'pick'): |
1498 stats = merge.graft(repo, origctx, origctx.p1(), |
1498 stats = merge.graft(repo, origctx, origctx.p1(), |
1499 [b'local', b'destination']) |
1499 [b'local', b'destination']) |
1500 if compat.hasconflict(stats): |
1500 if stats.unresolvedcount: |
1501 pickstate.addopts({b'orignode': origctx.node(), |
1501 pickstate.addopts({b'orignode': origctx.node(), |
1502 b'oldpctx': pctx.node()}) |
1502 b'oldpctx': pctx.node()}) |
1503 pickstate.save() |
1503 pickstate.save() |
1504 raise error.InterventionRequired(_(b"unresolved merge conflicts" |
1504 raise error.InterventionRequired(_(b"unresolved merge conflicts" |
1505 b" (see hg help resolve)")) |
1505 b" (see hg help resolve)")) |