tests/test-merge4
changeset 4286 949516072388
parent 2283 e506c14382fd