diff tests/test-evolve-order.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 06844693bb21
line wrap: on
line diff
--- a/tests/test-evolve-order.t	Thu Aug 24 10:48:38 2017 -0700
+++ b/tests/test-evolve-order.t	Thu Aug 24 10:57:32 2017 -0700
@@ -252,7 +252,7 @@
   1 new orphan changesets
   $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
   1 changesets pruned
-  2 new contentdivergent changesets
+  2 new content-divergent changesets
   $ hg up 'desc(b3prime)'
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg amend -m 'b3second'