Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/histedit.py
changeset 27344 43c00ca887d1
parent 27262 3d0feb2f978b
child 27403 50b6a04f817f 
--- a/hgext/histedit.py	Sat Dec 12 09:57:05 2015 -0800
+++ b/hgext/histedit.py	Mon Dec 14 18:54:03 2015 -0500
@@ -712,8 +712,8 @@
 
     def run(self):
         if self.repo['.'].node() != self.node:
-            mergemod.update(self.repo, self.node, False, True, False)
-            #                                     branchmerge, force, partial)
+            mergemod.update(self.repo, self.node, False, True)
+            #                                     branchmerge, force)
         return self.continueclean()
 
     def continuedirty(self):
Mercurial