Mercurial > hg
view tests/test-merge1.out @ 1441:cbc36ad70945
hgweb: a couple of fixes on search page
- show search string in the bottom search box
- wrap search boxes within paragraphs, this also puts
some space between last changeset and bottom
search box in firefox.
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Mon, 24 Oct 2005 17:54:06 -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