# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1579778376 -25200
# Node ID 946ebd8f08eac6a9e4b7a7011188ed8c8f039fe8
# Parent  17fac26833da5066b007adb524445ad761e6e9b6
tests: use --tool flag instead of --config ui.merge

Makes this test not fail on older hg versions.

diff -r 17fac26833da -r 946ebd8f08ea tests/test-evolve-content-divergent-first-changeset.t
--- a/tests/test-evolve-content-divergent-first-changeset.t	Thu Jan 23 11:01:46 2020 +0100
+++ b/tests/test-evolve-content-divergent-first-changeset.t	Thu Jan 23 18:19:36 2020 +0700
@@ -31,7 +31,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