tests/test-excessive-merge
changeset 4289 e17598881509
parent 3853 c0b449154a90