Mercurial > hg
view tests/helper-runtests.sh @ 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 | 054bcdad6042 |
children |
line wrap: on
line source
# # Avoid interference from actual test env: unset HGTEST_JOBS unset HGTEST_TIMEOUT unset HGTEST_PORT unset HGTEST_SHELL