Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 2143:3053fc33f545
Show repo's revlog format on verify. Warn if some files use a different format.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 27 Apr 2006 21:58:47 +0200 |
parents | 7544700fd931 |
children | b2ae81a7df29 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a