mercurial/mergestate.py
changeset 45493 2c10876bb320
parent 45492 08c6d6962b2a
child 45494 9ea4b52ac6bb
--- a/mercurial/mergestate.py	Wed Sep 16 10:09:37 2020 -0700
+++ b/mercurial/mergestate.py	Thu Sep 17 09:23:21 2020 -0700
@@ -177,12 +177,11 @@
     statepathv2 = b'merge/state2'
 
     @staticmethod
-    def clean(repo, node=None, other=None, labels=None):
+    def clean(repo):
         """Initialize a brand new merge state, removing any existing state on
         disk."""
         ms = mergestate(repo)
         ms.reset()
-        ms.start(node, other, labels)
         return ms
 
     @staticmethod