changeset 36784 | c164a3a282c1 |
parent 35400 | 4441705b7111 |
child 36785 | 66c569e57c70 |
--- 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]