--- a/hgext/rebase.py Fri Sep 18 10:15:13 2020 -0700
+++ b/hgext/rebase.py Fri Sep 18 15:10:14 2020 -0700
@@ -548,7 +548,6 @@
user=ctx.user(),
date=date,
)
- mergestatemod.mergestate.clean(repo)
else:
newnode = commitnode(
repo,
@@ -1089,9 +1088,6 @@
b' merge\n'
)
)
- # TODO: Make in-memory merge not use the on-disk merge state, so
- # we don't have to clean it here
- mergestatemod.mergestate.clean(repo)
clearstatus(repo)
clearcollapsemsg(repo)
return _dorebase(ui, repo, action, opts, inmemory=False)