--- 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()'