Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1506:11c8b81f95fe
if unambigious command name are passed, use them
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 04 Nov 2005 10:22:03 -0800 |
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