--- a/tests/test-divergent.t Fri Nov 09 20:18:59 2018 +0100
+++ b/tests/test-divergent.t Fri Nov 09 20:19:01 2018 +0100
@@ -55,7 +55,7 @@
1 changesets pruned
$ hg prune -s 593c57f2117e "desc('added b')" --hidden
1 changesets pruned
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log -G
@ 3:8374d2ddc3a4@default(draft) divergent [content-divergent]
@@ -70,7 +70,7 @@
with: [3] divergent
base: [1] added b
updating to "local" side of the conflict: 593c57f2117e
- merging "other" content-divergent changeset '8374d2ddc3a4'
+ merging "other" divergent changeset '8374d2ddc3a4'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at 45bf1312f454
$ hg log -G
@@ -115,7 +115,7 @@
1 changesets pruned
$ hg prune -s e3ff64ce8d4c 48819a835615 --hidden
1 changesets pruned
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log -G
@ 7:b2ae71172042@default(draft) add _c [content-divergent]
@@ -131,7 +131,7 @@
with: [7] add _c
base: [5] add _c
updating to "local" side of the conflict: e3ff64ce8d4c
- merging "other" content-divergent changeset 'b2ae71172042'
+ merging "other" divergent changeset 'b2ae71172042'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
nothing changed
working directory is now at e3ff64ce8d4c
@@ -172,7 +172,7 @@
1 changesets pruned
$ hg prune -s 05a6b6a9e633 37445b16603b --hidden
1 changesets pruned
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log -G
@ 3:6b096fb45070@default(draft) bdivergent [content-divergent]
|
@@ -200,7 +200,7 @@
merge:[3] bdivergent
with: [2] bdivergent
base: [1] add _b
- merging "other" content-divergent changeset '05a6b6a9e633'
+ merging "other" divergent changeset '05a6b6a9e633'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at 73ff357d3975