Mercurial > hg
comparison mercurial/upgrade_utils/__init__.py @ 47916:65e3d8028f2e
dirstate: drop the `_merge` method
It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.
Differential Revision: https://phab.mercurial-scm.org/D11351
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 24 Aug 2021 21:16:48 +0200 |
| parents | f105c49e89cd |
| children |
comparison
equal
deleted
inserted
replaced
| 47915:51cd60c0a345 | 47916:65e3d8028f2e |
|---|