tests/test-merge-commit
changeset 6298 53cbb33e1269
parent 4365 46280c004f22
child 8167 6c82beaaa11a