tests/test-merge-commit
changeset 4630 e6d105a51ec7
parent 4361 46280c004f22