diff -r 0c4077905932 -r 6062593d8b06 tests/test-shelve.t
--- a/tests/test-shelve.t	Sun May 25 13:47:42 2014 +0200
+++ b/tests/test-shelve.t	Fri May 23 13:10:31 2014 -0700
@@ -262,8 +262,6 @@
   summary:     second
   
   $ hg resolve -l
-  abort: resolve command not applicable when not merging
-  [255]
   $ hg status
   A foo/foo
   ? a/a.orig