--- a/hgext/rebase.py	Fri Feb 28 11:32:02 2020 -0800
+++ b/hgext/rebase.py	Fri Feb 28 11:32:27 2020 -0800
@@ -548,11 +548,6 @@
                     date=date,
                 )
 
-            if newnode is None:
-                # If it ended up being a no-op commit, then the normal
-                # merge state clean-up path doesn't happen, so do it
-                # here. Fix issue5494
-                mergemod.mergestate.clean(repo)
             return newnode
 
     def _rebasenode(self, tr, rev, allowdivergence, progressfn):