Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1413:1c64c628d15f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not use 'glob' expansion by default on OS != 'nt'
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 19 Oct 2005 00:02:41 -0700
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