Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1399:9a70776e355e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try to use ini-file in the same directory as the exe as the default on NT.
author Zbynek Winkler <zwin@users.sourceforge.net>
date Tue, 18 Oct 2005 17:57:27 -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