--- a/tests/test-evolve-templates.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-evolve-templates.t	Thu Aug 24 09:12:09 2017 +0200
@@ -618,7 +618,7 @@
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: fdf9bde5129a)
   $ hg amend -m "A2"
-  2 new divergent changesets
+  2 new contentdivergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip