merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
Is there an error message when trying to diff non-existing files?
found: No such file or directory
not: No such file or directory
Is there an error message when trying to add non-existing files?
found: No such file or directory
not: No such file or directory