--- a/mercurial/pure/parsers.py	Tue Sep 28 18:57:20 2021 +0200
+++ b/mercurial/pure/parsers.py	Tue Sep 28 19:12:44 2021 +0200
@@ -386,7 +386,7 @@
             # the object has no state to record, this is -currently-
             # unsupported
             raise RuntimeError('untracked item')
-        elif self.merged_removed:
+        elif self.removed and self._merged:
             return NONNORMAL
         elif self.from_p2_removed:
             return FROM_P2