tests/test-excessive-merge
changeset 4187 01c4ea5e788c
parent 3853 c0b449154a90