tests/test-merge-commit
changeset 5228 39e6deaa8b81
parent 4361 46280c004f22