tests/test-merge-commit
changeset 5943 ffaf2419de44
parent 4365 46280c004f22
child 8167 6c82beaaa11a