tests/test-excessive-merge
changeset 5095 f3f033def181
parent 3853 c0b449154a90