log tests/test-merge4.out @ 546:c8ae964109c1

age author description
Tue, 21 Jun 2005 19:19:39 -0800 mpm [PATCH] Removal of a file added by merging branches