Mercurial > hg

view tests/test-merge5.out @ 9566:449e85edc8f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-pt_BR: synchronized with a1ee850f49e3
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 28 Sep 2009 20:14:39 -0300
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')