Mercurial > hg

view tests/test-merge5.out @ 11575:a5903e612f07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: evaluate --user before invoking editor with -e (issue2289)
author Brendan Cully <brendan@kublai.com>
date Thu, 15 Jul 2010 10:41:41 -0700
parents 68a1b9d0663e
children
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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved