diff -r f5d472b7e800 -r a867d59ea97a tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 20:04:13 2017 +0200
@@ -76,7 +76,7 @@
    neuf
    dix
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg evolve
   move:[2] babar count up to fifteen
   atop:[4] babar count up to ten
@@ -114,7 +114,7 @@
   $ hg diff
   diff -r 5977072d13c5 babar
   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/babar	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/babar	* (glob)
   @@ -7,4 +7,4 @@
    sept
    eight
@@ -122,7 +122,7 @@
   -dix
   +ten
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg evolve
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
@@ -145,7 +145,7 @@
   | o  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   4:5977072d13c5
@@ -209,7 +209,7 @@
   -ten
   +zehn
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
   $ hg evolve --tool touch <<EOF
   > n
@@ -237,7 +237,7 @@
   | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     babar count up to fifteen
   | |
   | x  changeset:   7:e04690b09bc6