Mercurial > hg
view tests/test-merge5.out @ 9510:8bd669948b2e
doc: clarify license footers
Mercurial is licensed under version 2 of the GPL
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Thu, 01 Oct 2009 11:40:53 +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')