--- a/hgext/rebase.py	Fri Sep 18 15:03:06 2020 -0700
+++ b/hgext/rebase.py	Mon Sep 21 10:09:39 2020 -0700
@@ -1099,7 +1099,7 @@
                 )
             # update to the current working revision
             # to clear interrupted merge
-            hg.updaterepo(repo, rbsrt.originalwd, overwrite=True)
+            mergemod.clean_update(repo[rbsrt.originalwd])
             rbsrt._finishrebase()
             return 0
     elif inmemory: