merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
marked working directory as branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch c
c 5:5ca481e59b8c
a 1:dd6b440dd85a
b 4:22df7444f7c1 (inactive)
default 0:19709c5a4e75 (inactive)
-------
c 5:5ca481e59b8c
a 1:dd6b440dd85a