log tests/test-merge6 @ 711:734712f37de3

age author description
Mon, 04 Jul 2005 12:54:42 -0800 Matt Mackall update tests
Mon, 04 Jul 2005 12:38:34 -0800 maf46 Fix zombie files in merge