Mercurial > evolve

diff tests/test-stabilize-result.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 1db0137297f4
children 4b934144ed11
line wrap: on
line diff
--- a/tests/test-stabilize-result.t	Thu Aug 24 09:11:54 2017 +0200
+++ b/tests/test-stabilize-result.t	Thu Aug 24 09:12:09 2017 +0200
@@ -228,7 +228,7 @@
   $ cat a.old >> a
   $ rm a.old
   $ hg amend
-  2 new divergent changesets
+  2 new contentdivergent changesets
   $ glog
   @  19:eacc9c8240fe@default(draft) bk:[] More addition
   |
@@ -338,7 +338,7 @@
   (use 'hg evolve' to update to its successor: f344982e63c4)
   $ echo 'gotta break' >> a
   $ hg amend
-  2 new divergent changesets
+  2 new contentdivergent changesets
 # reamend so that the case is not the first precursor.
   $ hg amend -m "More addition (2)"
   $ hg phase 'contentdivergent()'