Mercurial > hg
view tests/bzr-definitions @ 12045:1e8c7999af86
Fix merge-tools.checkconflicts
re.match only looks at the beginning of the merged file, and without
re.MULTILINE the file had to end with ">>>>>>> something".
Now conflict markers inside the file are found, too.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 26 Aug 2010 17:38:43 +0200 |
parents | 95046688f80f |
children | f84dda152a55 |
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 echo 'hgext.graphlog = ' >> $HGRCPATH glog() { hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" } manifest() { echo "% manifest of $2" hg -R $1 manifest -v -r $2 }