Mercurial > hg
view tests/test-merge5.out @ 11620:86b49e0083a7
protocol: do not translate error messages on the remote side
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Fri, 16 Jul 2010 23:02:46 +0200 |
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