tests/test-merge3
changeset 2780 e7f70588af30
parent 1933 7544700fd931