tests/test-merge3
changeset 3852 8a9a1a7e1698
parent 1933 7544700fd931