Mercurial > hg

view tests/test-merge5.out @ 10317:192083a3e6fe stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zeroconf: gethostbyaddr may also fail with socket.herror
author Augie Fackler <durin42@gmail.com>
date Fri, 05 Feb 2010 10:16:52 -0600
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