Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4420:b0656b33cc02
add test for patchbomb extension.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 08 May 2007 12:20:13 -0700 |
parents | fffc8a733bf9 |
children |
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