tests/test-merge4
changeset 2936 21bf8929efc8
parent 2283 e506c14382fd