tests/test-merge1.out
author mpm@selenic.com
Tue, 13 Sep 2005 18:38:27 -0500
changeset 1236 67a28636ea64
parent 925 5a034646e472
child 1581 db10b7114de0
permissions -rw-r--r--
Fix bug with co -C across branches, update tests

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