Mercurial > hg
view tests/test-merge5.out @ 7742:fceb9fa01a00
hgweb: commit forgotten update to a3d7f99c23c0
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 09 Feb 2009 13:08:32 +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')