Mercurial > hg

view tests/test-merge5.out @ 10386:1ddb0ae26a55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zeroconf: better fix for readName error Stop parsing when an unknown type is seen, since it is impossible to resynchronize on the stream.
author Brendan Cully <brendan@kublai.com>
date Sun, 07 Feb 2010 19:39:29 +0100
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