Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1357:94586af53d2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replacing select.select() with os.fstat() which works also on windows.
author zbynek@alex.kolej.mff.cuni.cz
date Tue, 27 Sep 2005 15:01:49 -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