tests: don't use mkcommit shell function in test-divergent.t Upcoming series will start merging commit descriptions while resolving content-divergence. This tests are here to test the basics of content-divegrence resolution and we should not be testing much of commit description merge here. Replacing mkcommit function with normal hg calls will help us decide on the commit messages ourselves and prevent conflicts while merging commit messages.

# utility to setup pythonpath to point into the tested repository

export SRCDIR=`dirname $TESTDIR`
if [ -n "$PYTHONPATH" ]; then
    export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH
    export PYTHONPATH=$SRCDIR:$PYTHONPATH
else
    export PYTHONPATH=$SRCDIR
fi