Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 4391:722417b3d7fa
Add hgwebdir.fcgi to contrib
author | Michael Gebetsroither <michael.geb@gmx.at> |
---|---|
date | Sun, 29 Apr 2007 18:17:35 -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