changeset 47931 | 7033d1d5bd18 |
parent 47930 | 7c37d153c22d |
child 47932 | 59eddbaa5bfb |
--- a/mercurial/pure/parsers.py Fri Aug 27 17:09:06 2021 +0200 +++ b/mercurial/pure/parsers.py Fri Aug 27 17:09:49 2021 +0200 @@ -286,7 +286,7 @@ Should only be set if a merge is in progress in the dirstate """ - return self.v1_state() == b'n' and self.v1_size() == FROM_P2 + return self._wc_tracked and self._clean_p2 @property def from_p2_removed(self):