log tests/test-merge6.out @ 1925:c71420b186b0

age author description
Wed, 24 Aug 2005 19:19:35 -0700 mpm Update tests