diff --git a/tests/test-shelve.t b/tests/test-shelve.t
index 62983988bbf5a93ce49ab1ad2cd7e338b86faa3e_dGVzdHMvdGVzdC1zaGVsdmUudA==..781b09790633deb7cdedcdec96ec09ea840ea45f_dGVzdHMvdGVzdC1zaGVsdmUudA== 100644
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -810,6 +810,9 @@
   ? foo/foo
   $ hg bookmark
    \* test                      (4|13):33f7f61e6c5e (re)
+BROKEN: there shouldn't be a merge state
+  $ hg resolve -l
+  R a/a
   $ hg unshelve
   unshelving change 'test'
   temporarily committing pending changes (restore with 'hg unshelve --abort')