# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2018-03-07 18:55:57
# Node ID c164a3a282c155662baee51e2ba51b1b3b9fe268
# Parent  6dab3bdb1f00932a80ffa07f80ba240c3a4b48df

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

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 @@ Make sure merge state is cleaned up afte
   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]