tests/test-excessive-merge
changeset 5388 557e4a916e12
parent 3853 c0b449154a90