log tests/test-merge10.out @ 5460:fe9b0bb3eb1c

age author description
Sat, 23 Jun 2007 22:43:46 -0500 Giorgos Keramidas tests: add merge test for changeset 9fe267f77f56