Mercurial > hg
view tests/test-merge5.out @ 7192:f31ba106fc19
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Mon, 20 Oct 2008 17:40:29 +0200 |
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')