Mercurial > hg
view tests/test-merge5.out @ 10804:7258da493fe7
merge with i18n stable
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Wed, 31 Mar 2010 12:15:24 -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