tests: update the title of a test as it's not what it says
I see that this test has conflict in relocation and in merging also.
We do have a test for the case when only relocation leads to conflict.
# utility to setup pythonpath to point into the tested repository
export SRCDIR="`dirname $TESTDIR`"
if [ -n "$PYTHONPATH" ]; then
export HGTEST_ORIG_PYTHONPATH=$PYTHONPATH
if uname -o | grep -q Msys; then
export PYTHONPATH="$SRCDIR;$PYTHONPATH"
else
export PYTHONPATH=$SRCDIR:$PYTHONPATH
fi
else
export PYTHONPATH=$SRCDIR
fi