tests/test-merge3
changeset 5388 557e4a916e12
parent 1933 7544700fd931