diff tests/test-evolve-templates.t @ 2858:4b934144ed11

messages: use hyphenated '{phase,content}-divergent' in user messages The hyphenated version is more readable and it's what we use the {instabilities} template.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 24 Aug 2017 10:57:32 -0700
parents f6517779a7c4
children 462adae9fea7
line wrap: on
line diff
--- a/tests/test-evolve-templates.t	Thu Aug 24 10:48:38 2017 -0700
+++ b/tests/test-evolve-templates.t	Thu Aug 24 10:57:32 2017 -0700
@@ -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 contentdivergent changesets
+  2 new content-divergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip