tests/test-excessive-merge
changeset 2061 5987c1eac2ce
parent 1933 7544700fd931
child 2283 e506c14382fd