mercurial/pure/parsers.py

--- a/mercurial/pure/parsers.py	Sun Jul 04 03:29:20 2021 +0200
+++ b/mercurial/pure/parsers.py	Sat Jul 03 04:07:21 2021 +0200
@@ -79,6 +79,14 @@
         """
         return self._state
 
+    @property
+    def merged(self):
+        """True if the file has been merged
+
+        Should only be set if a merge is in progress in the dirstate
+        """
+        return self._state == b'm'
+
     def v1_state(self):
         """return a "state" suitable for v1 serialization"""
         return self._state