HomePhabricator

dirstate-item: replace another usage of `merged`

Authored by marmoute.

Description

dirstate-item: replace another usage of merged

We simply spell out the logic here. This was the last usage of merged.

Differential Revision: https://phab.mercurial-scm.org/D11596

Details

Committed
marmouteSep 30 2021, 9:29 PM
Differential Revision
D11596: dirstate-item: replace another usage of `merged`
Parents
rHGe0b4e4f80fff: dirstate-item: replace a `merged` usage with `p2_info`
Branches
Unknown
Tags
Unknown