author | Edouard Gomez <ed.gomez@free.fr> |
Tue, 04 Apr 2006 16:35:20 -0700 | |
changeset 2047 | ebf1ecb5f4e8 |
parent 1995 | 2da2d46862fb |
child 2175 | b2ae81a7df29 |
permissions | -rw-r--r-- |
%% 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