tests/test-merge3
changeset 4927 382520bacc17
parent 1933 7544700fd931