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

Memleak fixes #241

Merged
pks-t merged 2 commits from memleak-fixes into master 2015-08-12 19:04:23 -05:00
Conversation 0 Commits 2 Files Changed 2 +1
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37bb1a6025 - Show all commits

1
merge.go
View File

@ -394,6 +394,7 @@ func MergeFile(ancestor MergeFileInput, ours MergeFileInput, theirs MergeFileInp
return nil, MakeGitError(ecode) return nil, MakeGitError(ecode)
} }
populateCMergeFileOptions(copts, *options) populateCMergeFileOptions(copts, *options)
defer freeCMergeFileOptions(copts)
} }
runtime.LockOSThread() runtime.LockOSThread()