tests/test-merge3
changeset 3967 dccb83241dd0
parent 1933 7544700fd931