log tests/test-merge4.out @ 532:2e9698a5c92c

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