tests/test-merge3
changeset 4719 1069205a8894
parent 1933 7544700fd931