changeset 45557 | 2c86b9587740 |
parent 45556 | 03726f5b6092 |
child 45577 | 5c8230ca37f2 |
--- a/mercurial/hg.py Mon Sep 21 10:09:39 2020 -0700 +++ b/mercurial/hg.py Mon Sep 21 11:12:58 2020 -0700 @@ -1049,7 +1049,7 @@ When overwrite is set, changes are clobbered, merged else returns stats (see pydoc mercurial.merge.applyupdates)""" - return mergemod.update( + return mergemod._update( repo, node, branchmerge=False,