log tests/test-merge6.out @ 620:7369ec5d93f2

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