hgext/histedit.py

--- a/hgext/histedit.py	Thu Oct 18 10:11:08 2018 -0700
+++ b/hgext/histedit.py	Thu Feb 09 09:17:40 2017 -0800
@@ -830,8 +830,7 @@
 
     def run(self):
         if self.repo['.'].node() != self.node:
-            mergemod.update(self.repo, self.node, False, True)
-            #                                     branchmerge, force)
+            mergemod.update(self.repo, self.node, branchmerge=False, force=True)
         return self.continueclean()
 
     def continuedirty(self):