Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 4709:53eca35c3aeb
Add option "hidden" to hgwebdir.
TODO: should this option be renamed to 'hide_from_index' or
maybe to 'index_ignore' (like Apache's mod_autoindex) ?
author | Markus F.X.J. Oberhumer <markus@oberhumer.com> |
---|---|
date | Mon, 25 Jun 2007 14:46:20 +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