tests/test-excessive-merge
changeset 5437 71e7c86adcb7
parent 3853 c0b449154a90