Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1454:f4250806dbeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
further fix traceback on invalid .hgignore patterns Please apply this little fix (matchfn return None if no patterns are specified).
author Benoit Boissinot <mercurial-bugs@selenic.com>
date Wed, 26 Oct 2005 16:10:56 -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