tests/test-excessive-merge
changeset 4639 c7371aa0c153
parent 3853 c0b449154a90