merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
%% no changes
%% no changes
%% uncompressed contents in repo
this is a test
%% uncompress our working dir copy
this is a test
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% uncompress our new working dir copy
this is a test