# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1579778567 -25200
# Node ID 18d45ef90af1abe8c50495a153b9de575e6f8498
# Parent  f1ed956b2a908ff24a4c7ea3969dea102c5b34d8# Parent  946ebd8f08eac6a9e4b7a7011188ed8c8f039fe8
test-compat: merge stable into mercurial-5.2

diff -r f1ed956b2a90 -r 18d45ef90af1 tests/test-evolve-content-divergent-first-changeset.t
--- a/tests/test-evolve-content-divergent-first-changeset.t	Thu Jan 23 11:05:38 2020 +0100
+++ b/tests/test-evolve-content-divergent-first-changeset.t	Thu Jan 23 18:22:47 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