Mercurial > hg
view tests/test-merge5.out @ 4050:75313c36aa04
transplant: test non-local source
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 30 Jan 2007 11:40:17 -0800 |
parents | fffc8a733bf9 |
children | 4b0c9c674707 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes