tests/test-merge3
changeset 3474 bbfb392b2b1a
parent 1933 7544700fd931