changeset 44270 | f546d2170b0f |
parent 44212 | cb8b67016110 |
child 44440 | d543ef183eb8 |
--- a/hgext/histedit.py Wed Feb 05 16:16:15 2020 -0500 +++ b/hgext/histedit.py Wed Jan 15 15:30:25 2020 -0800 @@ -945,7 +945,7 @@ class base(histeditaction): def run(self): if self.repo[b'.'].node() != self.node: - mergemod.update(self.repo, self.node, branchmerge=False, force=True) + mergemod.clean_update(self.repo[self.node]) return self.continueclean() def continuedirty(self):