tests/test-excessive-merge
changeset 5458 cd1a6e7216c5
parent 3853 c0b449154a90