evolvecmd: the proper way to deal with conflicts is to resolve them
And it's worth making the suggestion an actual hint.
. $TESTDIR/testlib/pythonpath.sh
mkcommit() {
echo "$1" > "$1"
hg add "$1"
hg ci -m "$1"
}
getid() {
hg log --hidden --template '{node}\n' --rev "$1"
}
cat >> $HGRCPATH <<EOF
[alias]
debugobsolete=debugobsolete -d '0 0'
EOF