Mercurial > hg

view tests/test-merge5.out @ 10416:4cfd0d56be6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: add missing documentation for http_proxy.always
author Henrik Stuart <hg@hstuart.dk>
date Thu, 11 Feb 2010 21:11:59 +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