mercurial/pure/parsers.py
changeset 48153 c29d312657d2
parent 48152 8f88307f8e07
child 48154 7a8c9869e4fe
--- a/mercurial/pure/parsers.py	Fri Oct 01 03:29:33 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Oct 01 03:30:00 2021 +0200
@@ -314,14 +314,6 @@
         return self._wc_tracked and self._p2_info
 
     @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._wc_tracked and self._p1_tracked and self._p2_info
-
-    @property
     def removed(self):
         """True if the file has been removed"""
         return not self._wc_tracked and (self._p1_tracked or self._p2_info)