diff -r 232de244ab6f -r 19d6fec60b81 tests/test-add.t
--- a/tests/test-add.t	Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-add.t	Fri Apr 18 22:19:25 2014 -0700
@@ -107,6 +107,7 @@
   M a
   ? a.orig
   $ hg resolve -m a
+  no unresolved files; you may continue your unfinished operation
   $ hg ci -m merge
 
 Issue683: peculiarity with hg revert of an removed then added file