Mercurial > hg
view tests/test-merge1.out @ 1792:a161c61ba8ed
Cleanup of tabs and coding when sending content type.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 22 Feb 2006 08:32:51 +0100 |
parents | db10b7114de0 |
children | 2da2d46862fb |
line wrap: on
line source
%% no merges expected %% merge should fail abort: 'b' already exists in the working dir and differs from remote %% merge of b expected merging for b merging b %% Contents of b should be "this is file b1" This is file b1 %% merge fails abort: outstanding uncommited changes %% merge expected! merging for b merging b %% merge of b should fail abort: outstanding uncommited changes %% merge of b expected merging for b merging b