Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 2059:a4c271765415
run-tests: Use appropriate (that is: none) diff options on HP-UX.
author | Sascha Wilde <wilde@sha-bang.de> |
---|---|
date | Wed, 12 Apr 2006 17:53:04 +0200 |
parents | 2da2d46862fb |
children | b2ae81a7df29 |
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 uncommitted changes %% merge expected! merging for b merging b %% merge of b should fail abort: outstanding uncommitted changes %% merge of b expected merging for b merging b