tests/test-merge-commit
changeset 4643 a39cec1d5cb8
parent 4361 46280c004f22