tests/test-merge-commit
changeset 4780 8b90d763ea90
parent 4361 46280c004f22