Mercurial > hg
view tests/test-conflict.out @ 6389:0231f763ebc8
manifest: improve parsing performance by 8x via a new C extension
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 26 Mar 2008 10:12:10 -0700 |
parents | 4b0c9c674707 |
children | 92ccccb55ba3 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. 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 <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig