HomePhabricator

status: process `from_p2` file the same as `merged` one

Authored by marmoute.

Description

status: process from_p2 file the same as merged one

What matters here is that the file constains information coming from the second
parent and should be considered modified on plain `hg status.

So we can process from_p2 file sooner. It also highlight that we probably
don't need the merged/from_p2 distinction at higher level.

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

Details

Committed
marmouteSep 28 2021, 8:06 PM
Differential Revision
D11591: status: process `from_p2` file the same as `merged` one
Parents
rHGde0977ec2d25: dirstate: drop an incorrect comment
Branches
Unknown
Tags
Unknown