Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1556:561b17b7d3a2
Space/Tab cleanup in bash_completion.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 23 Nov 2005 08:07:27 +0100 |
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