tests/test-merge-commit
changeset 4463 3f444b82df9e
parent 4361 46280c004f22