tests/test-excessive-merge
changeset 4441 32ea809e5bd1
parent 3853 c0b449154a90