tests/test-merge1.out
author Eric Hopper <hopper@omnifarious.org>
Tue, 04 Oct 2005 12:24:59 -0700
changeset 1380 27add82ad845
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
Fix an hg copy/move bug. Failed if file being copied or moved not in tip.

%% 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