Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1533:3d11f81c9145

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reduce string duplication in compression code This cuts down on string copies and allows buffers (instead of strings) to be passed into the compression code
author mason@suse.com
date Fri, 11 Nov 2005 18:20:19 -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