view tests/test-merge5.out @ 7817:cb516e788238

bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set
author Alex Unden <alu@zpuppet.org>
date Fri, 27 Feb 2009 02:01:45 -0800
parents 0b89315d5de2
children 68a1b9d0663e
line wrap: on
line source

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