tests/test-merge3
changeset 2302 506fcf779cae
parent 1933 7544700fd931