tests/test-merge3
changeset 3851 8f18e31c4441
parent 1933 7544700fd931