Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 1309:332f225b835c
Make debugwalk strip trailing spaces and remove these from test-walk.out
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 21 Sep 2005 08:07:38 +0200 |
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