tests/test-excessive-merge
changeset 4659 7a7d4937272b
parent 3853 c0b449154a90