tests/test-excessive-merge
changeset 4583 11cf78983961
parent 3853 c0b449154a90