dirstate-item: introduce a `p2_info` property that combine two others...
dirstate-item: introduce a `p2_info` property that combine two others
The `merged` and `from_p2` property are always used together so we can expose a
combined property instead.
Differential Revision:
https://phab.mercurial-scm.org/D11585