tests/test-merge3
changeset 3376 1106e00e6847
parent 1933 7544700fd931