tests/test-merge1.out
author TK Soh <teekaysoh@yahoo.com>
Fri, 23 Sep 2005 17:19:35 -0700
changeset 1336 8c094fb47b59
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
hgweb file: fixed left-justified line numbers on IE v6.0 IE (v6.0) seemed to squash the spaces surrounding the line numbers, making them appeared as left- instead of being right-justified. Testing with IE v6.0 and Firefox 1.0.6.

%% 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