tests/test-merge-commit
changeset 4115 c95060a5391a
parent 4058 e7282dede8cd
child 4365 46280c004f22