--- a/tests/test-evolve-content-divergent-meta.t Wed Jun 05 17:46:06 2019 +0200
+++ b/tests/test-evolve-content-divergent-meta.t Wed Jun 05 17:56:44 2019 +0200
@@ -62,13 +62,12 @@
1 changesets pruned
$ hg prune -r "min(desc('added c'))" -s "max(desc('added c'))" --hidden
1 changesets pruned
- 2 new content-divergent changesets
$ hg glog
@ 4:6c06cda6dc99 added c
| draft content-divergent
|
- | * 3:0c9267e23c9d added c e
+ | o 3:0c9267e23c9d added c e
|/ draft content-divergent
|
o 1:1740ad2a1eda added b
@@ -80,7 +79,6 @@
$ cd ../userbar
$ hg pull ./../userfoo -q
- 2 new content-divergent changesets
$ hg evolve --content-divergent --any
merge:[3] added c e