Mercurial > hg > pyhgsh
view tests/test-conflict.out @ 1488:08c7851969cc
only files in normal state should be marked as deleted
fix a traceback when you removed an added file
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 02 Nov 2005 16:08:48 -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