view tests/testlib/obsmarker-common.sh @ 46027:1d5189a57405 stable 5.6.1

rebase: clear merge state when aborting in-memory merge on dirty working copy

Differential Revision: https://phab.mercurial-scm.org/D9509

mkcommit() {
   name="$1"
   shift
   echo "$name" > "$name"
   hg add "$name"
   hg ci -m "$name" "$@"
}

getid() {
   hg log --hidden --template '{node}\n' --rev "$1"
}

cat >> $HGRCPATH <<EOF
[alias]
debugobsolete=debugobsolete -d '0 0'
EOF