--- a/tests/test-merge7.t Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-merge7.t Fri Apr 18 22:19:25 2014 -0700
@@ -57,6 +57,7 @@
> EOF
$ rm -f *.orig
$ hg resolve -m test.txt
+ no unresolved files; you may continue your unfinished operation
$ hg commit -m "Merge 1"
change test-a again