Mercurial > hg
view tests/test-dirstate-backup.t @ 39285:a3fd84f4fb38
filemerge: fix the wrong placements of messages in prompt
Mistakenly, the local-changed-other-deleted-message was put in
other-change-local-deleted and vice versa. This followups on D4336.
Thanks to Yuya who spotted this.
Differential Revision: https://phab.mercurial-scm.org/D4375
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Sun, 26 Aug 2018 19:14:26 +0300 |
parents | c2b30348930f |
children | 8d72e29ad1e0 |
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 [255] No dirstate backups are left behind $ ls .hg/dirstate* | sort .hg/dirstate