tests/test-merge3
changeset 4286 949516072388
parent 1933 7544700fd931