fix bad merge (LastError -> MakeGitError)
wrap merge functions
merge options / merge tree options
switch from iota to explicit def
move finalizer above free
Add defaults, add simple test, merge heads should be pointer array
merge with latest, replace merge wrappers with go code
merge with latest
Merge branch 'jezell/merge' into merge
remove useless wrappers
Merge branch 'merge' of https://github.com/jezell/git2go into merge
Merge branch 'master' of http://github.com/libgit2/git2go into merge
update to new merge API
support nil merge options
Merge analysis and merge file
merge latest, copy merge bytes to go array
use cast_ptr instead of ptr for travis go tip build
Merge pull request #63 from jezell/jezell/merge

Merge functions (in progress)