tests/test-excessive-merge
changeset 4873 28b23b9073a8
parent 3853 c0b449154a90