tests/test-excessive-merge
changeset 4222 2792dbd648c7
parent 3853 c0b449154a90