Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1728:9b92b71d5dd7
add -w and -p options to diff. this is for issue 126.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 15 Feb 2006 10:39:47 -0800 |
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