Mercurial > hg

view tests/test-merge5.out @ 9095:89fd11257d75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/cvs: improve error message on unexpected server output.
author Greg Ward <greg-hg@gerg.ca>
date Wed, 08 Jul 2009 22:08:45 -0400
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')