tests/test-merge1.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 21 Sep 2005 11:44:08 -0700
changeset 1293 a6ffcebd3315
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
Enhance the file filtering capabilities. We now allow filtering through either pipes or pairs of temporary files. The latter appear to be mandatory for use on Windows.

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