changeset 48142 | fb3b41d583c2 |
parent 48138 | 38488d488ec1 |
child 48143 | 21542d4cb568 |
--- a/mercurial/pure/parsers.py Fri Oct 01 02:01:12 2021 +0200 +++ b/mercurial/pure/parsers.py Fri Oct 01 04:04:09 2021 +0200 @@ -301,6 +301,14 @@ 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