Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 1652:f910437af806
unbreak templates/summary-gitweb.tmpl
author | Peter van Dijk <peter@dataloss.nl> |
---|---|
date | Sun, 29 Jan 2006 00:31:11 +0100 |
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