tests/test-excessive-merge
changeset 3883 6081b4c68baf
parent 3853 c0b449154a90