tests/test-merge3
changeset 3592 fffc8a733bf9
parent 1933 7544700fd931