tests/test-excessive-merge
changeset 5279 2dbd750b3ddd
parent 3853 c0b449154a90