view tests/bzr-definitions @ 26525:abc2327e382a

filemerge: add some merge types

We're going to turn the 'trymerge' boolean into a 'mergetype' enum with these
three possible values.

# this file holds the definitions that are used in various bzr tests

TERM=dumb; export TERM
echo '[extensions]' >> $HGRCPATH
echo 'convert = ' >> $HGRCPATH

glog()
{
    hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
}

manifest()
{
    echo "% manifest of $2"
    hg -R $1 manifest -v -r $2
}