tests/test-excessive-merge
changeset 4658 17f5d2069551
parent 3853 c0b449154a90