changeset 44270 | f546d2170b0f |
parent 44212 | cb8b67016110 |
child 44374 | f5c006621f07 |
--- a/mercurial/shelve.py Wed Feb 05 16:16:15 2020 -0500 +++ b/mercurial/shelve.py Wed Jan 15 15:30:25 2020 -0800 @@ -745,7 +745,7 @@ try: checkparents(repo, state) - merge.update(repo, state.pendingctx, branchmerge=False, force=True) + merge.clean_update(state.pendingctx) if state.activebookmark and state.activebookmark in repo._bookmarks: bookmarks.activate(repo, state.activebookmark) mergefiles(ui, repo, state.wctx, state.pendingctx)