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