tests/test-excessive-merge
changeset 4015 769be3c57564
parent 3853 c0b449154a90