--- a/tests/test-merge7.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-merge7.t	Fri May 09 14:46:50 2014 -0500
@@ -57,7 +57,7 @@
   > EOF
   $ rm -f *.orig
   $ hg resolve -m test.txt
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m "Merge 1"
 
 change test-a again