view tests/test-merge5.out @ 7481:5f681a143ede

bookmarks: more git-like branches

Bookmarks are not really git branches, but with the track.current option we try
to focus more on a git like behavior as this was requested.

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