tests/test-merge-commit
changeset 4420 b0656b33cc02
parent 4058 e7282dede8cd
child 4361 46280c004f22