Mercurial > hg
view tests/test-merge5.out @ 9766:4e0d99a5a9f9
i18n-it: synchronized with e06c940d554d
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 25 Oct 2009 12:46:23 +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')