Mercurial > hg-stable

view tests/test-merge1.out @ 1427:0980d77f5e9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed problem with invoking hgmerge on paths with spaces.
author michael.w.dales@intel.com
date Mon, 24 Oct 2005 14:54:17 -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