jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Merge functions (in progress) #63

Merged
jezell merged 17 commits from jezell/merge into master 2014-04-26 13:42:18 -05:00
Conversation 5 Commits 17 Files Changed 6 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d8cbe7547 - Show all commits

4
merge.go
View File

@ -182,7 +182,7 @@ func (r *Repository) MergeCommits(ours *Commit, theirs *Commit, options *MergeOp
idx := &Index{}
ret := C.git_merge_commits(&idx.ptr, r.ptr, ours.ptr, theirs.ptr, copts)
ret := C.git_merge_commits(&idx.ptr, r.ptr, ours.cast_ptr, theirs.cast_ptr, copts)
if ret < 0 {
return nil, MakeGitError(ret)
}
@ -198,7 +198,7 @@ func (r *Repository) MergeTrees(ancestor *Tree, ours *Tree, theirs *Tree, option
idx := &Index{}
ret := C.git_merge_trees(&idx.ptr, r.ptr, ancestor.ptr, ours.ptr, theirs.ptr, copts)
ret := C.git_merge_trees(&idx.ptr, r.ptr, ancestor.cast_ptr, ours.cast_ptr, theirs.cast_ptr, copts)
if ret < 0 {
return nil, MakeGitError(ret)
}