mercurial/pure/parsers.py

48141:42ab0bcb6ded

        elif self._p2_info:
            return False
        return True

    @property
    def merged(self):
        """True if the file has been merged

        Should only be set if a merge is in progress in the dirstate
        """

48142:fb3b41d583c2

        elif self._p2_info:
            return False
        return True

    @property
    def p2_info(self):
        """True if the file needed to merge or apply any input from p2

        See the class documentation for details.
        """
        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
        """