--- a/tests/test-evolve-templates.t	Tue Jul 25 15:18:09 2017 +0200
+++ b/tests/test-evolve-templates.t	Wed Sep 27 01:22:58 2017 +0200
@@ -111,7 +111,6 @@
   |      semi-colon: [a468dc9b3633]
   o  ea207398892e
   
-
   $ hg up 'desc(A2)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
@@ -449,7 +448,7 @@
   $ hg up 'desc(A0)' --hidden
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (471f378eab4c)
-  (471f378eab4c has diverged, use 'hg evolve --list --divergent' to resolve the issue)
+  (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
 
 Precursors template should show current revision as it is the working copy
   $ hg tlog