--- a/tests/test-evolve-content-divergent-first-changeset.t	Mon Nov 04 00:18:55 2019 +0530
+++ b/tests/test-evolve-content-divergent-first-changeset.t	Sat Feb 01 12:50:10 2020 +0100
@@ -36,7 +36,7 @@
   4b2524b7508e
   79fa0eb22d65
 
-  $ hg evolve --content-divergent --config ui.merge=internal:other
+  $ hg evolve --content-divergent --tool :other
   merge:[1] div1
   with: [2] div2
   base: [0] test