diff -r 19d6fec60b81 -r e4f451c8c05c tests/test-resolve.t
--- a/tests/test-resolve.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-resolve.t	Fri May 09 14:46:50 2014 -0500
@@ -39,7 +39,7 @@
 
   $ echo resolved > file
   $ hg resolve -m file
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m 'resolved'
 
 resolve -l should error since no merge in progress