tests/test-merge3
changeset 2547 d75c68b55af8
parent 1933 7544700fd931