tests/test-excessive-merge
changeset 4718 934275cd4526
parent 3853 c0b449154a90