Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1513:5c3b93b244aa
copy & rename don't overwrite unless --force is specified
author | Robin Farine <robin.farine@terminus.org> |
---|---|
date | Tue, 08 Nov 2005 10:35:09 -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