diff -r f80e8e3c3726 -r c768f7666106 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-stabilize-conflict.t	Mon Jun 02 15:22:23 2014 -0700
@@ -164,6 +164,7 @@
   reverting babar
   $ safesed 's/dix/ten/' babar
   $ hg resolve --all -m
+  no more unresolved files
   $ hg evolve --continue
   grafting revision 5
   $ hg resolve -l