tests/test-merge4
changeset 2424 092039246d73
parent 2283 e506c14382fd