merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
#!/bin/sh
# test command parsing and dispatch
hg init a
cd a
echo a > a
hg ci -Ama -d '0 0'
echo "# missing arg"
hg cat
echo '% [defaults]'
hg cat a
cat > $HGRCPATH <<EOF
[defaults]
cat = -v
EOF
hg cat a
echo '% no repo'
cd ..
hg cat
exit 0