tests/test-excessive-merge
changeset 5329 7e6138cb8d38
parent 3853 c0b449154a90