diff -r 35518d26b549 -r ba95cec18fe9 tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Thu Jun 18 23:45:37 2015 -0700
+++ b/tests/test-stabilize-result.t	Fri Jun 19 10:47:02 2015 -0700
@@ -85,7 +85,7 @@
   warning: conflicts during merge.
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   evolve failed!
-  fix conflict and run "hg evolve --continue"
+  fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg revert -r 'unstable()' a