Comments
Patch
@@ -2489,7 +2489,7 @@
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
@@ -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