# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2020-09-16 05:40:26
# Node ID 0ce6af73f48103614d3e655d06c853e6ee4504d1
# Parent  a108f7ff77787c17ec3e213da7745893f3e021d7

mergestate: make some callers not pass pointless node argument

The node argument is set on the created `mergestate` instance, but
these callers don't even look at that instance.

Differential Revision: https://phab.mercurial-scm.org/D9031

diff --git a/hgext/strip.py b/hgext/strip.py
--- a/hgext/strip.py
+++ b/hgext/strip.py
@@ -269,7 +269,7 @@ def stripcmd(ui, repo, *revs, **opts):
             repo.dirstate.write(repo.currenttransaction())
 
             # clear resolve state
-            mergestatemod.mergestate.clean(repo, repo[b'.'].node())
+            mergestatemod.mergestate.clean(repo)
 
             update = False
 
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2516,7 +2516,7 @@ class localrepository(object):
                 ui.status(
                     _(b'working directory now based on revision %d\n') % parents
                 )
-            mergestatemod.mergestate.clean(self, self[b'.'].node())
+            mergestatemod.mergestate.clean(self)
 
         # TODO: if we know which new heads may result from this rollback, pass
         # them to destroy(), which will prevent the branchhead cache from being