--- a/mercurial/pure/parsers.py	Fri Oct 01 03:28:01 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Oct 01 03:29:33 2021 +0200
@@ -334,7 +334,7 @@
             raise RuntimeError('untracked item')
         elif self.removed:
             return b'r'
-        elif self.merged:
+        elif self._p1_tracked and self._p2_info:
             return b'm'
         elif self.added:
             return b'a'