--- a/tests/test-add.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-add.t	Fri May 09 14:46:50 2014 -0500
@@ -107,7 +107,7 @@
   M a
   ? a.orig
   $ hg resolve -m a
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg ci -m merge
 
 Issue683: peculiarity with hg revert of an removed then added file