Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge9.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 | dc5920ea12f8 |
children | f191bc3916f7 |
line wrap: on
line source
adding bar adding foo adding quux1 adding quux2 merging bar merging bar failed! merging foo and baz merging foo failed! 1 files updated, 0 files merged, 0 files removed, 2 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 3 files updated, 0 files merged, 1 files removed, 0 files unresolved merging bar merging bar failed! merging baz and foo merging baz failed! 1 files updated, 0 files merged, 0 files removed, 2 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 1 hg merge 2