tests/test-merge-commit
changeset 5379 d3e51dc804f8
parent 4361 46280c004f22