tests/test-merge1.out
author Will <will@glozer.net>
Wed, 16 Nov 2005 20:53:16 +0100
changeset 1548 18f3224da392
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
fix bug in setup.py introduced in r1508. The 'console' argument is expected to be a list of strings, but was changed to just a string.

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