Mercurial > hg-stable
changeset 36784:c164a3a282c1
tests: .hg/merge is a directory, so use `test -d`
This part of test-rebase-interrupts.t would have passed before the fix
in a580b2d65ded (rebase: make sure merge state is cleaned up for no-op
rebases (issue5494), 2017-05-18).
Differential Revision: https://phab.mercurial-scm.org/D2713
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 07 Mar 2018 10:55:57 -0800 |
| parents | 6dab3bdb1f00 |
| children | 66c569e57c70 |
| files | tests/test-rebase-interruptions.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-interruptions.t Tue Mar 06 14:29:20 2018 -0800 +++ b/tests/test-rebase-interruptions.t Wed Mar 07 10:55:57 2018 -0800 @@ -461,5 +461,5 @@ note: rebase of 1:fdaca8533b86 created no changes to commit saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg $ hg resolve --list - $ test -f .hg/merge + $ test -d .hg/merge [1]