tests/test-merge-commit
changeset 5133 4f648e95caca
parent 4361 46280c004f22