Mercurial > hg
view tests/test-dirstate-backup.t @ 48152:8f88307f8e07
dirstate-item: replace another usage of `merged`
We simply spell out the logic here. This was the last usage of `merged`.
Differential Revision: https://phab.mercurial-scm.org/D11596
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 01 Oct 2021 03:29:33 +0200 |
parents | 8d72e29ad1e0 |
children | ffd19d73518d |
line wrap: on
line source
Set up $ hg init repo $ cd repo Try to import an empty patch $ hg import --no-commit - <<EOF > EOF applying patch from stdin abort: stdin: no diffs found [10] No dirstate backups are left behind $ ls .hg/dirstate* | sort .hg/dirstate