--- a/tests/test-stabilize-order.t	Fri Jun 19 14:32:54 2015 -0700
+++ b/tests/test-stabilize-order.t	Fri Jun 19 14:26:33 2015 -0700
@@ -153,8 +153,8 @@
   $ hg up 9
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg evolve -v
-  nothing to evolve here
-  (1 troubled changesets, do you want --any ?)
+  nothing to evolve on current working copy parent
+  (1 other unstable in the repository, do you want --any or --rev)
   [2]
   $ hg evolve --any -v
   move:[9] addc
@@ -180,5 +180,5 @@
   o  0:c471ef929e6a@default(draft) addroot
   
   $ hg evolve --any -v
-  abort: no troubled changes in the specified revisions
-  [255]
+  no unstable changesets to evolve
+  [1]