log tests/test-merge10 @ 7769:8c06d4bf2c23

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