author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Thu, 23 Mar 2006 23:39:53 +0100 | |
changeset 1990 | 4b0535c678d6 |
parent 1581 | db10b7114de0 |
child 1995 | 2da2d46862fb |
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 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