Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 2152:57729c56a23c
Show repo's revlog format on verify only if it doesn't match the default format.
This makes it easier to run the tests with different revlog formats.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 28 Apr 2006 21:52:08 +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