Mercurial > hg
diff mercurial/pure/parsers.py @ 47930:7c37d153c22d
dirstate-item: implement `merged` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11367
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 27 Aug 2021 17:09:06 +0200 |
parents | 03f57915e0ce |
children | 7033d1d5bd18 |
line wrap: on
line diff
--- a/mercurial/pure/parsers.py Fri Aug 27 17:07:56 2021 +0200 +++ b/mercurial/pure/parsers.py Fri Aug 27 17:09:06 2021 +0200 @@ -276,7 +276,7 @@ Should only be set if a merge is in progress in the dirstate """ - return self.v1_state() == b'm' + return self._wc_tracked and self._merged @property def from_p2(self):