tests/test-excessive-merge
changeset 4800 6aa1fae4c28a
parent 3853 c0b449154a90