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 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6af4d4a825 - Show all commits

2
merge.go
View File

@ -26,8 +26,8 @@ func newMergeHeadFromC(c *C.git_merge_head) *MergeHead {
}
func (mh *MergeHead) Free() {
C.git_merge_head_free(mh.ptr)
runtime.SetFinalizer(mh, nil)
C.git_merge_head_free(mh.ptr)
}
func (r *Repository) MergeHeadFromFetchHead(branchName string, remoteURL string, oid *Oid) (*MergeHead, error) {