Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1264:be4a14bfaa9c
Generated new tcsh_completion with tcsh_completion_build.sh
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 16 Sep 2005 21:34:18 +0200 |
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