Mercurial > evolve

diff tests/test-evolve-templates.t @ 2856:f6517779a7c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning: rename warning message divergent has been renamed into contentdivergent. Use their renamed counterpart in warning message for new unstable changesets. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
author Boris Feld <boris.feld@octobus.net>
date Thu, 24 Aug 2017 09:12:09 +0200
parents 20c2499ce8bc
children 4b934144ed11
line wrap: on
line diff
--- a/tests/test-evolve-templates.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-evolve-templates.t	Thu Aug 24 09:12:09 2017 +0200
@@ -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 divergent changesets
+  2 new contentdivergent changesets
   $ hg log --hidden -G
   @  changeset:   3:65b757b745b9
   |  tag:         tip