merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test

#!/bin/sh

mkdir t
cd t
hg init
echo "invalid" > .hg/hgrc
hg status 2>&1 |sed -e "s:/.*\(/t/.*\):...\1:"