tests/test-merge3
changeset 5397 11caa374f497
parent 1933 7544700fd931