Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 1165:04be5eb73bb3
Fixed import needed to serve zip files which broke because of other changes.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 30 Aug 2005 19:12:17 +0200 |
| parents | 9c918287d10b |
| children | 696851b1bba9 |
comparison
equal
deleted
inserted
replaced
| 1164:cf8185cf2a70 | 1165:04be5eb73bb3 |
|---|