log tests/test-merge1 @ 691:61c6b4178b9e

age author description
Tue, 21 Jun 2005 21:07:08 -0800 mpm Fix up test-merge1