--- a/tests/test-shelve.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-shelve.t	Fri May 09 14:46:50 2014 -0500
@@ -294,7 +294,7 @@
 
   $ hg revert -r . a/a
   $ hg resolve -m a/a
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
 
   $ hg commit -m 'commit while unshelve in progress'
   abort: unshelve already in progress