tests/test-evolve-templates.t
branchmercurial-4.3
changeset 3106 a867d59ea97a
parent 3105 f5d472b7e800
child 3108 9c9c8c1eeb93
child 3116 9f900937c198
--- a/tests/test-evolve-templates.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Oct 20 20:04:13 2017 +0200
@@ -631,21 +631,21 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip
   |  parent:      0:ea207398892e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  instability: content-divergent
+  |  trouble:     divergent
   |  summary:     A2
   |
   | o  changeset:   2:fdf9bde5129a
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    instability: content-divergent
+  |    trouble:     divergent
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c