Mercurial > hg

view tests/test-merge5.out @ 11242:f4a8478dcd3f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-pt_BR: synchronized with ed71cb07d7b2
author Wagner Bruna <wbruna@yahoo.com>
date Sat, 22 May 2010 11:22:36 -0300
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