tests/test-merge3
changeset 3704 9c1737a3e254
parent 1933 7544700fd931