evolve: rename some variable ahead of time
A refactoring of the content divergence resolution in on its way. use a
distinctive name for some variable early to make the change easier to read
later.
. $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
}