tests/test-excessive-merge
changeset 3846 18855084b922
parent 3736 ad3d5b4367cb
child 3853 c0b449154a90