Mercurial > hg
view tests/test-merge5.out @ 12213:218bd2a056f5 stable
i18n-it: perform msgmerge on the tip of the stable branch
author | Paolo Giarrusso <p.giarrusso@gmail.com> |
---|---|
date | Sat, 21 Aug 2010 00:33:13 +0200 |
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