--- a/mercurial/dirstate.py	Wed Sep 15 10:20:25 2021 +0200
+++ b/mercurial/dirstate.py	Wed Sep 15 11:13:46 2021 +0200
@@ -734,7 +734,10 @@
                 # (see `merged_removed` and `from_p2_removed`)
                 if entry.merged_removed or entry.from_p2_removed:
                     source = self._map.copymap.get(f)
-                    self._addpath(f, from_p2=True)
+                    if entry.merged_removed:
+                        self._addpath(f, merged=True)
+                    else:
+                        self._addpath(f, from_p2=True)
                     self._map.copymap.pop(f, None)
                     if source is not None:
                         self.copy(source, f)