tests/test-excessive-merge
changeset 6212 e75aab656f46
parent 3853 c0b449154a90