Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.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 | b2ae81a7df29 |
children | 46280c004f22 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved merge: warning: conflicts during merge merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a