Mercurial > hg

view tests/test-merge5.out @ 7717:f9ba30cb7ee4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: expose sibling branches to templater
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 26 Jan 2009 15:52:10 +0100
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')