--- a/tests/test-evolve-content-divergent-basic.t	Sat Jun 01 02:30:14 2019 +0200
+++ b/tests/test-evolve-content-divergent-basic.t	Tue Jun 04 11:08:44 2019 +0200
@@ -20,7 +20,7 @@
   > git = 1
   > unified = 0
   > [ui]
-  > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline} [{troubles}]\n
+  > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline} [{instabilities}]\n
   > [extensions]
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
@@ -139,8 +139,6 @@
   merge:[2] divergent
   with: [3] divergent
   base: [1] added b
-  updating to "local" side of the conflict: 593c57f2117e
-  merging "other" content-divergent changeset '8374d2ddc3a4'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 45bf1312f454
   $ hg log -G
@@ -231,13 +229,12 @@
   o  0:8fa14d15e168 added hgignore
       () [default] draft
 
-  $ hg evolve --content-divergent --config ui.interactive=True<<EOF
+  $ hg evolve --content-divergent --no-all --config ui.interactive=True << EOF
   > c
   > EOF
   merge:[6] added d
   with: [5] added d
   base: [4] added d
-  merging "other" content-divergent changeset '9e5dffcb3d48'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergent changesets on different branches.
   choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar?  c
@@ -288,11 +285,10 @@
   o  0:8fa14d15e168 added hgignore
       () [default] draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[9] added a d with bar in it, expect some beers
   with: [8] added d
   base: [7] added d
-  merging "other" content-divergent changeset 'f621d00f5f0e'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at a9d6fd6b5e40
 
@@ -337,11 +333,10 @@
   o  0:8fa14d15e168 added hgignore
       () [default] draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[12] foo to d
   with: [11] foo to d
   base: [10] added a d with bar in it, expect some beers
-  merging "other" content-divergent changeset 'b10b07a394f1'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -397,11 +392,10 @@
   o  0:8fa14d15e168 added hgignore
       () [default] draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[15] wat to d, wat?
   with: [14] bar to d, expect beers
   base: [13] foo to d
-  merging "other" content-divergent changeset '27f0463f169a'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -505,14 +499,14 @@
 
 Stabilize it
 
-  $ hg evolve -qn --confirm --content-divergent
+  $ hg evolve -qn --confirm --content-divergent --no-all
   merge:[3] More addition
   with: [2] More addition
   base: [1] More addition
   perform evolve? [Ny] n
   abort: evolve aborted by user
   [255]
-  $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent
+  $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent --no-all
   merge:[3] More addition
   with: [2] More addition
   base: [1] More addition
@@ -523,7 +517,7 @@
   hg up -C 867e43582046 &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r 051337a45e7c --template={desc}`";
-  $ hg evolve -v --content-divergent
+  $ hg evolve -v --content-divergent --no-all
   merge:[3] More addition
   with: [2] More addition
   base: [1] More addition
@@ -601,18 +595,17 @@
   o  0:6569b5a81c7e@default(public) bk:[] root
   
 
-  $ hg evolve -qn --content-divergent
+  $ hg evolve -qn --content-divergent --no-all
   hg update -c 13c1b75640a1 &&
   hg merge 5bf84d1d71d1 &&
   hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 5bf84d1d71d1"&&
   hg up -C 867e43582046 &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`";
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[6] More addition (2)
   with: [4] More addition
   base: [1] More addition
-  merging "other" content-divergent changeset '5bf84d1d71d1'
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -960,8 +953,6 @@
   merge:[2] E2
   with: [3] E3
   base: [1] E1
-  updating to "local" side of the conflict: 084ae625fa51
-  merging "other" content-divergent changeset '19ed1bf64a2c'
   merging numbers
   merging romans
   1 files updated, 2 files merged, 0 files removed, 0 files unresolved