check parent commit for changed files on merge

check parent commit for changed files on merge #8235