log tests/test-merge6.out @ 660:2c83350784c3

age author description
Wed, 06 Jul 2005 22:27:25 -0800 Matt Mackall Update tests
Mon, 04 Jul 2005 12:38:34 -0800 maf46 Fix zombie files in merge