Mercurial > hg

view tests/test-merge5.out @ 7686:fa584d23e3cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not install executable man pages Default mode of install might be 755, therefore specify 644.
author Christian Ebert <blacktrash@gmx.net>
date Sun, 25 Jan 2009 12:21:57 +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')