tests/test-backout.t

--- a/tests/test-backout.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-backout.t	Fri May 09 14:46:50 2014 -0500
@@ -490,7 +490,7 @@
   merging foo
   my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
    premerge successful
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg status
   M foo
   ? foo.orig