Mercurial > hg-stable

view tests/test-merge5.out @ 7830:55bd03e2e13c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-identify: require no-outer-repo The test expects "There is no Mercurial repository here (.hg not found)"
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 05 Mar 2009 14:53:59 +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')