Mercurial > hg-stable

view tests/test-merge5.out @ 7725:6a888d491eaf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
coal/paper: switch to XHTML 1.1
author Benoit Allard <benoit@aeteurope.nl>
date Thu, 05 Feb 2009 18:15:33 +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')