Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1416:19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 19 Oct 2005 20:54:46 -0700 |
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