tests/test-merge-commit
changeset 4210 6cb5be6bd70f
parent 4058 e7282dede8cd
child 4361 46280c004f22