implementing merge with default options
implementing merge with default options
implementing merge with default options - new test
implementing merge with default options - minor change
fix blame argument handling

The argument handling for the new Repository_blame had several problems:

- The call to PyArg_ParseTupleAndKeywords was missing &path, so none
  of the optional arguments got parsed correctly.
- newest_commit and oldest_commit were missing type validation
  against OidType.
- The opts structure was discarded rather than passed to git_blame_file.

This commit fixes these issues and adds a test case.
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
Issue#298: Fix compilation on Windows
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