Merge pull request #4598 from cjhoward92/fix/remove-unused-merge-result types: remove unused git_merge_result