tests/test-merge3
changeset 2552 bb403d427974
parent 1933 7544700fd931