Mercurial > hg-stable

view tests/test-merge1.out @ 1393:67779d34cb52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix traceback on bad revlog.lookup
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Oct 2005 15:49:05 -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