tests/test-merge-commit
changeset 4350 3380eb6d7c32
parent 4058 e7282dede8cd
child 4361 46280c004f22