implementing merge with default options
implementing merge with default options
implementing merge with default options - new test
implementing merge with default options - minor change
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
implementing merge: some small fixes in merge.rst
implementing merge: removing index field from MergeResult
implementing merge: removing index field from merge.rst
Merge remote-tracking branch 'victor/master'
Remove trailing whitespace
merge: remove unused reference to the repository