tests/test-merge3
changeset 2580 a20a1bb0c396
parent 1933 7544700fd931