Mercurial > hg
view tests/test-merge5.out @ 10544:2e1a9b811d13 stable
httprepo: normalize output from unbundle with ssh
Lines from the remote are prefixed with 'remote: ' and written
locally using ui.status, similar to what sshrepo does.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Wed, 24 Feb 2010 12:35:26 -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