Mercurial > hg

view tests/test-merge5.out @ 10144:69a974125938

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-help: improve test coverage Adds a test for displaying a help topic. Extends test coverage of commands.help_ by 5 lines.
author Henri Wiechers <hwiechers@gmail.com>
date Thu, 24 Dec 2009 18:53:36 +0200
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