tests/test-merge3
changeset 2172 eba364839c67
parent 1933 7544700fd931