hgext/strip.py
changeset 45490 0ce6af73f481
parent 44856 b7808443ed6a
child 45514 93a0f3ba36bb
--- a/hgext/strip.py	Thu Sep 17 09:56:05 2020 -0700
+++ b/hgext/strip.py	Tue Sep 15 22:40:26 2020 -0700
@@ -269,7 +269,7 @@
             repo.dirstate.write(repo.currenttransaction())
 
             # clear resolve state
-            mergestatemod.mergestate.clean(repo, repo[b'.'].node())
+            mergestatemod.mergestate.clean(repo)
 
             update = False