tests/test-excessive-merge
changeset 5948 597d8402087d
parent 3853 c0b449154a90