# HG changeset patch # User Sushil khanchi # Date 1591061090 -19800 # Node ID af210e6293c54ba377f30383c141cdff3941b7bb # Parent 6664e9f44bcaf5648e8d9d5b9c44f6615d3e7d2c evolve: add setup utility for testing content-divergence resolution diff -r 6664e9f44bca -r af210e6293c5 tests/testlib/content-divergence-util.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/testlib/content-divergence-util.sh Tue Jun 02 06:54:50 2020 +0530 @@ -0,0 +1,35 @@ +#!/bin/sh +# setup config and various utility to test content-divergence resolution + +. $TESTDIR/testlib/common.sh + +cat >> $HGRCPATH <