tests/test-merge-commit
changeset 6246 35bf9c23e17a
parent 4365 46280c004f22
child 8167 6c82beaaa11a