Mercurial > hg
view tests/test-merge5.out @ 10195:1139fcfeaeda
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 01 Jan 2010 18:10:10 -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