Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1524:0d47bb884330
hgweb: fix traceback by skipping invalid repo paths
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Wed, 09 Nov 2005 13:40:08 -0800 |
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