test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
# this file holds the definitions that are used in various bzr tests
"$TESTDIR/hghave" bzr || exit 80
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
}