--- a/tests/test-evolve-content-divergent-first-changeset.t	Wed Mar 04 15:45:33 2020 +0100
+++ b/tests/test-evolve-content-divergent-first-changeset.t	Wed Mar 04 15:47:08 2020 +0100
@@ -6,6 +6,7 @@
   > evolution.allowdivergence = True
   > EOF
 
+
 This test file tests the case of content-divergence resolution of changesets
 that have the null revision as the parent.
 

--- a/tests/test-evolve-interrupted.t	Wed Mar 04 15:45:33 2020 +0100
+++ b/tests/test-evolve-interrupted.t	Wed Mar 04 15:47:08 2020 +0100
@@ -52,7 +52,7 @@
   $ hg l
   @  2 apricot and blueberry
   
-  *  1 banana
+  %  1 banana
   |
   x  0 apricot
   
@@ -80,7 +80,7 @@
   $ hg l
   @  2 apricot and blueberry
   
-  *  1 banana
+  %  1 banana
   |
   x  0 apricot
   

--- a/tests/test-evolve-issue5967.t	Wed Mar 04 15:45:33 2020 +0100
+++ b/tests/test-evolve-issue5967.t	Wed Mar 04 15:47:08 2020 +0100
@@ -69,6 +69,6 @@
        rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ hg olog --hidden --all 1
-  x  dd9b5dd30cd6 (1) banana
+  %  dd9b5dd30cd6 (1) banana
        pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   

--- a/tests/test-evolve-progress.t	Wed Mar 04 15:45:33 2020 +0100
+++ b/tests/test-evolve-progress.t	Wed Mar 04 15:47:08 2020 +0100
@@ -42,8 +42,6 @@
   move:[2] third
   hg rebase -r 769574b07a96 -d 5f16d91ecde0
   evolve: 2/3 changesets (66.67%)
-    unmatched files in other:
-     b
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96
@@ -154,8 +152,6 @@
   atop:[11] second
   hg rebase -r 53c0008d98a0 -d 60a86497fbfe
   evolve: 2/3 changesets (66.67%)
-    unmatched files in other:
-     b
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0