log tests/test-merge6.out @ 676:32f7dc81c07e

age author description
Sun, 10 Jul 2005 16:17:05 -0800 Andrew Thompson Remove references to 'cloning by hardlink' from tests.
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