diff tests/test-evolve-templates.t @ 3002:00e4d31b8cdb mercurial-4.1

compat-test: merge future 6.7.0 into 4.1 compat branch

(mergeing through 4.2 compat branch)

--- a/tests/test-evolve-templates.t	Tue Jul 25 15:17:42 2017 +0200
+++ b/tests/test-evolve-templates.t	Wed Sep 27 01:12:47 2017 +0200
@@ -73,10 +73,10 @@
   o  d004c8f274b9 (4) A2
   |
   x  a468dc9b3633 (3) A1
-  |    rewritten(description) by test2 (*) as d004c8f274b9 (glob)
+  |    rewritten(description) as d004c8f274b9 by test2 (*) (glob)
   |
   @  471f378eab4c (1) A0
-       rewritten(description, content) by test1 (*) as a468dc9b3633 (glob)
+       rewritten(description, content) as a468dc9b3633 by test1 (*) (glob)
   
   $ hg tlog
   o  d004c8f274b9
@@ -120,7 +120,6 @@
   |      semi-colon: [a468dc9b3633]
   o  ea207398892e
   
-
   $ hg up 'desc(A2)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
@@ -460,7 +459,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