This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: replace a `merged` usage with `from_p2`

Authored by marmoute on Oct 2 2021, 8:40 PM.



It seems more accurate and no test complains (XXX hopefully XXX).

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Oct 2 2021, 8:40 PM
baymax updated this revision to Diff 30600.Oct 3 2021, 6:51 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare added a subscriber: Alphare.Oct 3 2021, 5:15 PM

The commit message says from_p2, but it's p2_info. I'll amend on-the-fly

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.