( )⚙ D11351 dirstate: drop the `_merge` method

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: drop the `_merge` method
ClosedPublic

Authored by marmoute on Aug 26 2021, 10:21 AM.

Details

Summary

It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.

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.Aug 26 2021, 10:21 AM
Alphare accepted this revision.Aug 27 2021, 5:47 AM
This revision is now accepted and ready to land.Aug 27 2021, 5:47 AM
This revision was automatically updated to reflect the committed changes.