tests/test-excessive-merge
changeset 2117 760339ccc799
parent 1933 7544700fd931
child 2283 e506c14382fd