tests/test-merge-commit
changeset 4863 0875082d5471
parent 4361 46280c004f22