Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 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 | 5a034646e472 |
children | 7544700fd931 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! 32e80765d7fe+75234512624c+ tip something else ======= something M a