view tests/test-merge5.out @ 7138:0df098871e3d

test-permission: put sane permissions at the end of the test

If we don't do that, we won't delete all directories at the end of the test

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')