Mercurial > hg
view tests/test-merge5.out @ 10512:261cc6b0f15c
Merge with stable
author | Steve Borho <steve@borho.org> |
---|---|
date | Thu, 18 Feb 2010 23:23:17 -0600 |
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