--- a/mercurial/pure/parsers.py	Fri Aug 27 17:14:54 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Aug 27 18:04:49 2021 +0200
@@ -286,7 +286,9 @@
 
         Should only be set if a merge is in progress in the dirstate
         """
-        return self._wc_tracked and self._clean_p2
+        if not self._wc_tracked:
+            return False
+        return self._clean_p2 or (not self._p1_tracked and self._p2_tracked)
 
     @property
     def from_p2_removed(self):