tests/test-merge-commit
changeset 6899 56a7a54e074f
parent 4365 46280c004f22
child 8167 6c82beaaa11a