Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 1286:4f08da74cae8
Make incoming/outgoing show oldest first
author | mpm@selenic.com |
---|---|
date | Thu, 22 Sep 2005 09:22:25 -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