tests/test-merge-commit
changeset 4887 2f09df302f30
parent 4365 46280c004f22
child 8167 6c82beaaa11a