tests/test-excessive-merge
changeset 2989 78fe7e2c2e1e
parent 2283 e506c14382fd
child 3736 ad3d5b4367cb