Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 1389:9b3ef6f3cef5
convert-repo: fix up octopus merge conversion
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 05 Oct 2005 19:27:35 -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