tests/test-merge3
changeset 3671 86d3f966201d
parent 1933 7544700fd931