diff -r 03726f5b6092 -r 2c86b9587740 hgext/rebase.py --- a/hgext/rebase.py Mon Sep 21 10:09:39 2020 -0700 +++ b/hgext/rebase.py Mon Sep 21 11:12:58 2020 -0700 @@ -642,7 +642,7 @@ cmdutil.bailifchanged(repo) self.inmemory = False self._assignworkingcopy() - mergemod.update( + mergemod._update( repo, p1, branchmerge=False, @@ -1517,7 +1517,7 @@ # See explanation in merge.graft() mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node()) - stats = mergemod.update( + stats = mergemod._update( repo, rev, branchmerge=True,