Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1502:1170fef58071

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed test-static-http with http_proxy variable set again.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 03 Nov 2005 18:59:36 +0100
parents 67a28636ea64
children db10b7114de0
line wrap: on
line source

%% no merges expected
%% merge of b expected
merging for b
merging b
%%
Contents of b should be "this is file b1"
This is file b1
%% merge expected!
merging for b
merging b
%% merge of b expected
merging for b
merging b