Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1667:daff3ef0de8d
verify: notice extra data in indices
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 30 Jan 2006 19:34:35 +1300 |
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