Mercurial > hg
view tests/test-merge5.out @ 11580:69248b5add46
protocol: move most ssh responses to returns
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 14 Jul 2010 15:25:15 -0500 |
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