Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1272:060c08bf9e2f
Update version number in PKG-INFO
author | Florian La Roche <laroche@redhat.com> |
---|---|
date | Sun, 18 Sep 2005 14:05:04 -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