Mercurial > hg
view tests/test-merge1.out @ 1566:8befbb4e30b2
Handle hg under /
author | Arun Sharma <arun@sharma-home.net> |
---|---|
date | Thu, 01 Dec 2005 10:48:42 -0600 |
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