Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1421:a7631cf1326a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Option -i broken in py2exe_for_demandload Using the includes option -i on modified py2exe is not working. Change: - setup.py: convert self.includes to a list.
author Volker Kleinfeld <Volker.Kleinfeld@gmx.de>
date Mon, 24 Oct 2005 14:52:30 -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