diff -r 3c0efa0eeea6 -r c8d6e23fb14a mercurial/merge.py
--- a/mercurial/merge.py	Thu Jul 08 21:26:21 2021 +0200
+++ b/mercurial/merge.py	Thu Jul 08 22:08:32 2021 +0200
@@ -2149,10 +2149,10 @@
                 if not branchmerge:
                     repo.dirstate.setbranch(p2.branch())
 
-    # If we're updating to a location, clean up any stale temporary includes
-    # (ex: this happens during hg rebase --abort).
-    if not branchmerge:
-        sparse.prunetemporaryincludes(repo)
+                # If we're updating to a location, clean up any stale temporary includes
+                # (ex: this happens during hg rebase --abort).
+                if not branchmerge:
+                    sparse.prunetemporaryincludes(repo)
 
     if updatedirstate:
         repo.hook(