tests/test-merge5.out
author Alex Unden <alu@zpuppet.org>
Fri, 27 Feb 2009 02:01:45 -0800
changeset 7817 cb516e788238
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set

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