tests/test-excessive-merge
changeset 5273 4287590a63af
parent 3853 c0b449154a90