Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 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
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" hg merge 1 hg id cat a hg status