Mercurial > hg
view tests/test-symlink-os-yes-fs-no.py.out @ 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 | 89630d0b3e23 |
children |
line wrap: on
line source
adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files new changesets d326ae2d01ee (1 drafts) 4 files updated, 0 files merged, 0 files removed, 0 files unresolved adding changesets adding manifests adding file changes added 1 changesets with 4 changes to 4 files new changesets d326ae2d01ee (1 drafts) 4 files updated, 0 files merged, 0 files removed, 0 files unresolved