Mercurial > hg > pyhgsh
view tests/test-merge1.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 | 67a28636ea64 |
children | db10b7114de0 |
line wrap: on
line source
%% no merges expected %% merge of b expected merging for b merging b %% Contents of b should be "this is file b1" This is file b1 %% merge expected! merging for b merging b %% merge of b expected merging for b merging b