Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1277:0bf11906df28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a favicon.ico, small version of the main HG image.
author Ollivier Robert <roberto@keltia.freenix.fr>
date Mon, 19 Sep 2005 22:15:36 +0200
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