tests/test-excessive-merge
changeset 4932 93b7e2fa7ee3
parent 3853 c0b449154a90