Mercurial > hg
view tests/test-merge5.out @ 6374:31a01e3d99cc
hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 24 Mar 2008 16:20:15 +0100 |
parents | 6aa4a3fa4e60 |
children | cdc458b12f0f |
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: update spans branches, use 'hg merge' or 'hg update -C' to lose changes % should succeed 1 files updated, 0 files merged, 0 files removed, 0 files unresolved