tests/test-excessive-merge
changeset 4350 3380eb6d7c32
parent 3853 c0b449154a90