Mercurial > hg > pyhgsh

view tests/test-merge1.out @ 1345:c5594ff3f95c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk: Allow specifying hgk path in [hgk]path
author mpm@selenic.com
date Fri, 23 Sep 2005 19:41:45 -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