Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1505:27f08094cfe0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for -r option in hg tag
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Thu, 03 Nov 2005 17:19:59 -0800
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