tests/test-merge-commit
changeset 4565 8b87bd4fb7ce
parent 4361 46280c004f22