tests/test-excessive-merge
changeset 5465 9873cbb134b2
parent 3853 c0b449154a90