tests/test-merge-commit
changeset 4692 c135c6cddbec
parent 4361 46280c004f22