tests/test-merge-commit
changeset 4923 59b8ff35c4ed
parent 4365 46280c004f22
child 8167 6c82beaaa11a