tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 21 Sep 2005 11:44:08 -0700
changeset 1293 a6ffcebd3315
parent 925 5a034646e472
child 2019 ced2d3620f95
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.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)