Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1571:bcdc030c59f8
add a --switch-parent option to export against the other parent
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 14 Dec 2005 21:01:57 -0600 |
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