diff -r e6d7d261ca4a -r 3ef96578da43 tests/test-evolve-content-divergent-corner-cases.t
--- a/tests/test-evolve-content-divergent-corner-cases.t	Wed Apr 24 17:02:27 2019 +0800
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Wed Apr 24 17:21:21 2019 +0800
@@ -199,15 +199,16 @@
   > [extensions]
   > testextension=$TESTTMP/test_extension.py
   > EOF
-  $ hg evolve --all
+  $ hg evolve
   nothing to evolve on current working copy parent
   (do you want to use --content-divergent)
   [2]
   $ hg evolve --content-divergent
-  merge:[3] bdivergent
-  with: [2] bdivergent
+  merge:[2] bdivergent
+  with: [3] bdivergent
   base: [1] add _b
-  merging "other" content-divergent changeset '05a6b6a9e633'
+  updating to "local" side of the conflict: 05a6b6a9e633
+  merging "other" content-divergent changeset '6b096fb45070'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 73ff357d3975
 
@@ -364,10 +365,11 @@
 Resolve the divergence, only "a" should be removed
 
   $ hg evolve --content-divergent --update
-  merge:[3] delete a
-  with: [2] delete a
+  merge:[2] delete a
+  with: [3] delete a
   base: [1] delete a
-  merging "other" content-divergent changeset '0825dcee2670'
+  updating to "local" side of the conflict: 0825dcee2670
+  merging "other" content-divergent changeset '92ecd58f9b05'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory is now at 7ca6a9fafcf6
   $ hg glog