Mercurial > hg > pyhgsh

view tests/test-merge1.out @ 1470:fb9b84c91222

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix on command help docstrings
author TK Soh <teekaysoh@yahoo.com>
date Thu, 27 Oct 2005 13:29:28 -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