Mercurial > evolve

changeset 5085:18d45ef90af1 mercurial-5.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-5.2
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 23 Jan 2020 18:22:47 +0700
parents f1ed956b2a90 (current diff) 946ebd8f08ea (diff)
children 553b2f2fda93 a958927b0232
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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