dirstate-item: replace another usage of `merged`

We simply spell out the logic here. This was the last usage of `merged`.

Differential Revision: https://phab.mercurial-scm.org/D11596

mercurial/pure/parsers.py

@@ -334,7 +334,7 b' class DirstateItem(object):'
             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'

rust/hg-core/src/dirstate/entry.rs

@@ -219,7 +219,10 b' impl DirstateEntry {'
         }
         if self.removed() {
             EntryState::Removed
-        } else if self.merged() {
+        } else if self
+            .flags
+            .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
+        {
             EntryState::Merged
         } else if self.added() {
             EntryState::Added