# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2021-08-27 15:09:06
# Node ID 7c37d153c22d2241f085aeb4e4e261e00636383d
# Parent  03f57915e0ce28c81525af5b108200bab697bf77

dirstate-item: implement `merged` in a simpler way

We can simply use the underlying attribute.

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

diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -276,7 +276,7 @@ class DirstateItem(object):
 
         Should only be set if a merge is in progress in the dirstate
         """
-        return self.v1_state() == b'm'
+        return self._wc_tracked and self._merged
 
     @property
     def from_p2(self):