tests/test-evolve-templates.t
branchmercurial-4.3
changeset 3166 e1a230cc4527
parent 3116 9f900937c198
parent 3154 406992d0d611
child 3167 f089741039e5
child 3418 85cdce113c2c
--- a/tests/test-evolve-templates.t	Mon Oct 23 15:50:18 2017 +0200
+++ b/tests/test-evolve-templates.t	Wed Nov 01 23:57:56 2017 +0100
@@ -668,7 +668,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 --contentdivergent' to resolve the issue)
+  (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
 
 Precursors template should show current revision as it is the working copy
   $ hg tlog