--- a/tests/test-commit-unresolved.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-commit-unresolved.t	Fri May 09 14:46:50 2014 -0500
@@ -41,7 +41,7 @@
 Mark the conflict as resolved and commit
 
   $ hg resolve -m A
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m "Merged"
 
   $ cd ..