Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2171:290534ee163c
Add download links to hgwebdir index page for allowed archive types.
Based on a patch by Colin McMillen <mcmillen@cs.cmu.edu>
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 01 May 2006 10:02:17 +0200 |
parents | 5c4496ed152d |
children | b2ae81a7df29 |
line wrap: on
line source
removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)