Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 1932:82995896d5af
Merge with http://hg.home.dataloss.nl/hg-portabletests
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 13 Mar 2006 12:22:55 +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