Mercurial > hg
view tests/test-merge1.out @ 1574:32b091ce4026
[hgweb] More gitweb style related fixes
Fixed manifest link on tags page
Fixed changeset link on manifest page
author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
---|---|
date | Mon, 05 Dec 2005 05:01:28 -0500 |
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