--- a/tests/test-keyword.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-keyword.t	Fri May 09 14:46:50 2014 -0500
@@ -1058,7 +1058,7 @@
 resolve to local
 
   $ HGMERGE=internal:local hg resolve -a
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg commit -m localresolve
   $ cat m
   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $