Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 1560:6efad1cc07de
Merge with http://hg.omnifarious.org/~hopper/mercurial
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 29 Nov 2005 18:06:23 +0100 |
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