tests: add the new "-r" bit to the usual merge hint
CORE-TEST-OUTPUT-UPDATE: 8197b395710e
. $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
}