changeset 45556 | 03726f5b6092 |
parent 45544 | 2b339c6c6e99 |
child 45565 | c1d0f83d62c4 |
--- a/mercurial/commands.py Fri Sep 18 15:03:06 2020 -0700 +++ b/mercurial/commands.py Mon Sep 21 10:09:39 2020 -0700 @@ -3247,7 +3247,7 @@ if not graftstate.exists(): raise error.Abort(_(b"no interrupted graft found")) pctx = repo[b'.'] - hg.updaterepo(repo, pctx.node(), overwrite=True) + mergemod.clean_update(pctx) graftstate.delete() ui.status(_(b"stopped the interrupted graft\n")) ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])