Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge1.out
author Benoit Boissinot <mercurial-bugs@selenic.com>
Wed, 26 Oct 2005 16:10:56 -0700
changeset 1454 f4250806dbeb
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
further fix traceback on invalid .hgignore patterns Please apply this little fix (matchfn return None if no patterns are specified).

%% 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
mercurial-crew-with-dirclash