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 mpm@selenic.com
Fri, 23 Sep 2005 19:41:45 -0700
changeset 1345 c5594ff3f95c
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
hgk: Allow specifying hgk path in [hgk]path

%% 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