Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1500:cadde8ebf167
Fixed to convert to man properly.
author | Hidetaka Iwai <tyuyu@debian.or.jp> |
---|---|
date | Thu, 03 Nov 2005 11:56:51 +0900 |
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