log tests/test-merge6.out @ 616:d45d1c90032e

age author description
Mon, 04 Jul 2005 12:38:34 -0800 maf46 Fix zombie files in merge