This revision was automatically updated to reflect the committed changes. Closed by commit rHGc164a3a282c1: tests: .hg/merge is a directory, so use `test -d` (authored by martinvonz, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D2713?vs=6701&id=6722 REVISION DETAIL https://phab.mercurial-scm.org/D2713 AFFECTED FILES tests/test-rebase-interruptions.t CHANGE DETAILS diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t --- a/tests/test-rebase-interruptions.t +++ b/tests/test-rebase-interruptions.t @@ -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] To: martinvonz, #hg-reviewers, indygreg Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
