Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1463:26e73acc0cdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix to handle case of empty list for roots or heads in nodesbetween.
author Eric Hopper <hopper@omnifarious.org>
date Mon, 10 Oct 2005 17:20:38 -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