Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 5271:5c2ca6d6ab21
Make test-convert-git compatible with other git versions (tested with 1.4.4.3)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 31 Aug 2007 12:32:18 +0200 |
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