tests/test-excessive-merge
changeset 7824 0b5c7c239d29
parent 3853 c0b449154a90