tests/test-merge-commit
changeset 4596 8e37342cb05d
parent 4058 e7282dede8cd
child 4361 46280c004f22