diff -r 4358f29af833 -r 19ec729f3ca2 tests/test-evolve-orphan-merge.t
--- a/tests/test-evolve-orphan-merge.t	Tue Apr 24 08:57:18 2018 +0100
+++ b/tests/test-evolve-orphan-merge.t	Mon Apr 23 12:11:10 2018 +0200
@@ -56,7 +56,7 @@
   $ hg glog
   @  4:64370c9805e7 added b
   |   () draft
-  | *    3:3b2b6f4652ee merging a and b
+  | o    3:3b2b6f4652ee merging a and b
   | |\    () draft
   +---x  2:d76850646258 added b
   | |     () draft
@@ -101,7 +101,7 @@
   $ hg glog
   @  6:3d41537b44ca added a
   |   () draft
-  | *    5:91fd62122a4b merging a and b
+  | o    5:91fd62122a4b merging a and b
   | |\    () draft
   +---o  4:64370c9805e7 added b
   | |     () draft
@@ -177,7 +177,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ echo foobar > c
   $ hg resolve -m
@@ -205,7 +205,7 @@
   $ hg glog
   @  11:31c317b7bdb1 foo to c
   |   () draft
-  | *    10:fd41d25a3e90 foobar to c
+  | o    10:fd41d25a3e90 foobar to c
   | |\    () draft
   +---o  9:d0f84b25d4e3 bar to c
   | |     () draft
@@ -262,7 +262,7 @@
   $ hg glog
   @  13:928097d0b5b5 foo to c
   |   () draft
-  | *    12:c5405d2da7a1 foobar to c
+  | o    12:c5405d2da7a1 foobar to c
   | |\    () draft
   +---x  11:31c317b7bdb1 foo to c
   | |     () draft
@@ -338,13 +338,13 @@
   $ hg glog
   @  20:fccc9de66799 added l
   |   () draft
-  | *    19:190763373d8b merge commit
+  | o    19:190763373d8b merge commit
   | |\    () draft
   | | o  18:863d11043c67 added y
   | | |   () draft
   +---o  17:3f2247835c1d added x
   | |     () draft
-  | *  16:e44dc179e7f5 added m
+  | o  16:e44dc179e7f5 added m
   | |   () draft
   | x  15:8634bee7bf1e added l
   |/    () draft
@@ -406,7 +406,7 @@
   |   () draft
   | o  24:3f371171d767 added l
   |/    () draft
-  | *    23:7b78a9784f3e merged l and x
+  | o    23:7b78a9784f3e merged l and x
   | |\    () draft
   +---x  20:fccc9de66799 added l
   | |     () draft