tests/test-merge3
changeset 3675 6990e499d71a
parent 1933 7544700fd931