--- a/tests/test-prev-next.t	Wed Jun 24 20:17:57 2015 -0700
+++ b/tests/test-prev-next.t	Wed Jun 24 20:23:41 2015 -0700
@@ -135,7 +135,7 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   [2] added c
   $ hg next
-  no non-obsolete children
+  no children
   [1]
   $ hg prev
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -146,7 +146,7 @@
   $ hg amend -m 'added b (2)'
   1 new unstable changesets
   $ hg next
-  no non-obsolete children
+  no children
   [1]
   $ hg evolve
   move:[2] added c
@@ -166,9 +166,10 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [3] added b (2)
   $ hg next
+  ambigious next changeset:
   [4] added c
   [5] added d
-  multiple non-obsolete children, explicitly update to one of them
+  explicitly update to one of them
   [1]
 
 next with ambiguity in aspiring children
@@ -176,7 +177,7 @@
   $ hg am -m 'added b (3)'
   2 new unstable changesets
   $ hg next
-  no non-obsolete children
+  no children
   [1]
   $ hg evolve
   abort: multiple evolve candidates