merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
error: pretxncommit.nocommits hook failed: no commits allowed
abort: no commits allowed
transaction abort!
rollback completed
error: pretxncommit.nocommits hook failed: no commits allowed
abort: no commits allowed
transaction abort!
rollback completed