Mercurial > hg
view tests/test-merge1.out @ 1338:2b77ea66fe70
Add empty repo test
author | mpm@selenic.com |
---|---|
date | Fri, 23 Sep 2005 17:52:15 -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