Mercurial > hg-stable

view tests/test-merge1.out @ 1265:979c04997448 0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update doc for ssh URL, describing path handling more clearly.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 16 Sep 2005 13:34:29 -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