tests/test-excessive-merge
changeset 4713 c29ee52e0b68
parent 3853 c0b449154a90