Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1447:508a3f559553
revert added and removed files to their normal state before reverting
add a test for revert
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 25 Oct 2005 15:51:28 -0700 |
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