diff -r a8ac174010a5 -r 39d282fd04e0 tests/test-evolve-obshistory-content-divergent.t --- a/tests/test-evolve-obshistory-content-divergent.t Fri Dec 20 14:08:37 2019 +0700 +++ b/tests/test-evolve-obshistory-content-divergent.t Mon Nov 04 01:30:50 2019 +0530 @@ -5,6 +5,10 @@ ============ $ . $TESTDIR/testlib/obshistory_setup.sh + $ cat >> $HGRCPATH << EOF + > [experimental] + > evolution.allowdivergence = True + > EOF Test output with content-divergence ===================================