tests/test-excessive-merge
changeset 3913 283ee8971570
parent 3853 c0b449154a90