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.
. $TESTDIR/testlib/common.sh
cat >> $HGRCPATH <<EOF
[ui]
interactive = true
[phases]
publish=False
[extensions]
evolve =
[experimental]
evolution.effect-flags = yes
EOF
sync() {
hg pull -R $TESTTMP/server . -q
}