tests/test-excessive-merge
changeset 6526 cfeeac24fc1e
parent 3853 c0b449154a90