tests/test-merge-commit
changeset 4184 b1716a1f79c4
parent 4058 e7282dede8cd
child 4361 46280c004f22