Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4709:53eca35c3aeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes