tests/test-excessive-merge
changeset 5249 d82ebcdf20e1
parent 3853 c0b449154a90