tests/test-evolve-content-divergent-basic.t
branchmercurial-4.4
changeset 4516 f54bb6eaf5e6
parent 4513 d70db7e455dc
child 4553 aafd51f145ea
--- a/tests/test-evolve-content-divergent-basic.t	Thu Apr 11 22:42:14 2019 +0200
+++ b/tests/test-evolve-content-divergent-basic.t	Thu Apr 11 22:44:53 2019 +0200
@@ -107,7 +107,6 @@
   1 changesets pruned
   $ hg prune -s 593c57f2117e "desc('added b')" --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
   $ hg log -G --patch
   @  3:8374d2ddc3a4@default(draft) divergent [content-divergent]
@@ -118,7 +117,7 @@
   |  @@ -0,0 +1,1 @@
   |  +bdivergent
   |
-  | *  2:593c57f2117e@default(draft) divergent [content-divergent]
+  | o  2:593c57f2117e@default(draft) divergent [content-divergent]
   |/   diff --git a/bdivergent1 b/bdivergent1
   |    new file mode 100644
   |    --- /dev/null
@@ -272,12 +271,11 @@
 
   $ hg prune -r 0ac42f1bc15c -s . --hidden
   1 changesets pruned
-  2 new content-divergent changesets
 
   $ hg glog
   @  9:59081c9c425a added a d with bar in it, expect some beers
   |   () [default] draft
-  | *  8:f621d00f5f0e added d
+  | o  8:f621d00f5f0e added d
   |/    () [foobar] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft