tests/test-excessive-merge
changeset 6683 76fc270561d1
parent 3853 c0b449154a90