Mercurial > hg
view tests/bzr-definitions @ 21552:61151f429a5f
update: introduce --tool for controlling the merge tool
Update is a kind of merge and may also need a merge tool and should have the
options described in the merge-tools help.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 19 May 2014 01:53:34 +0200 |
parents | aa9385f983fa |
children | 89872688893f |
line wrap: on
line source
# this file holds the definitions that are used in various bzr tests "$TESTDIR/hghave" bzr || exit 80 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 }