Mercurial > hg
view tests/test-merge5.out @ 7711:a0de99db7cdc
i18n: add python-format comments to da.po
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Sun, 25 Jan 2009 20:16:35 +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')