tests/test-merge4
changeset 5379 d3e51dc804f8
parent 2283 e506c14382fd