diff tests/test-topic-tutorial.t @ 3013:945a0989e41b

packaging: merge stable back into default

6.7.0 has been released.

--- a/tests/test-topic-tutorial.t	Wed Sep 27 16:24:44 2017 +0200
+++ b/tests/test-topic-tutorial.t	Wed Sep 27 16:26:30 2017 +0200
@@ -1182,7 +1182,7 @@
   t0^ add a pair of shoes (base)
 
   $ hg amend -m "Adding hammer to the shopping list"
-  2 new unstable changesets
+  2 new orphan changesets
 
 Understanding the current situation with hg log is not so easy, because
 it shows too many things:
@@ -1211,14 +1211,14 @@
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
+  | |  instability: orphan
   | |  summary:     Adding drill
   | |
   | o  changeset:   14:d4f97f32f8a1
   | |  topic:       tools
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
+  | |  instability: orphan
   | |  summary:     Adding saw
   | |
   | x  changeset:   13:a8ab3599d53d