previous/next: add -m short form for --merge
This matches core's option to `hg update`.
This patch also covers `hg next`, but test-check-commit.t only lets me
mention one of them.
#!/bin/sh
. $TESTDIR/testlib/pythonpath.sh
# This file holds logic that is used in many tests.
# It can be called in a test like this:
# $ . "$TESTDIR/testlib/topic_setup.sh"
# Enable obsolete markers and enable extensions
cat >> $HGRCPATH << EOF
[experimental]
evolution=createmarkers,exchange
[extensions]
rebase=
topic=
EOF