Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1239:29f17e083e84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Turn hgit into an extension, and add commands supporting the latest gitk
author mason@suse.com
date Tue, 13 Sep 2005 19:33:10 -0500
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