implementing merge - some fixes for the pull request: MergeRestul typedef, pep7 fixes and some error checks
implementing merge: merge.rst doc and implementing MergeResult as a simple type that maps git_merge_result to it