tests/test-merge-commit
changeset 5311 5b6e403601d1
parent 4361 46280c004f22