( )⚙ D11596 dirstate-item: replace another usage of `merged`

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: replace another usage of `merged`
ClosedPublic

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

Details

Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
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 30601.Oct 3 2021, 6:51 AM

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

Alphare accepted this revision.Oct 3 2021, 5:16 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:16 PM
This revision was automatically updated to reflect the committed changes.