Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1390:ce95599eedac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Borrow patch header detection heuristic from quilt
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Oct 2005 15:04:22 -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