tests/test-merge3
changeset 1996 4c70b10f0418
parent 1933 7544700fd931