view tests/test-merge5.out @ 7757:af6a63438a8a

identify: have consistent output for local repositories

Also, add some extensive testing for it (hardly any in the suite so far).

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')