tests/test-merge-commit
changeset 4156 30857b5779f8
parent 4058 e7282dede8cd
child 4361 46280c004f22