Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 5435:d0c67b52ac01
convert: make contents of "extra" dict available from sources, for sinks.
This breaks hash preservation for hg->hg conversion, as each converted
change gets a convert_revision item added to its extra dict. Ugh.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 10 Oct 2007 15:30:00 -0700 |
parents | 93a4e72b4f83 |
children |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 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 <<<<<<< my something else ======= something >>>>>>> other M a