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

#!/bin/sh

hg init a
cd a
hg -v log -v
hg -v log -v x
true