diff options
| author | Carlos Martín Nieto <[email protected]> | 2015-08-13 02:04:23 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2015-08-13 02:04:23 +0200 |
| commit | 3d15c877d8d34c4268a7455bc60129681fa09100 (patch) | |
| tree | 8029b5a664e4370c032115d19c0c2c49b191dfa5 /merge.go | |
| parent | ed62fda34df271875320f72f36a870b78248ece2 (diff) | |
| parent | 37bb1a6025eac8b1e689686f8830a20a266394cf (diff) | |
Merge pull request #241 from pks-t/memleak-fixes
Memleak fixes
Diffstat (limited to 'merge.go')
| -rw-r--r-- | merge.go | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -394,6 +394,7 @@ func MergeFile(ancestor MergeFileInput, ours MergeFileInput, theirs MergeFileInp return nil, MakeGitError(ecode) } populateCMergeFileOptions(copts, *options) + defer freeCMergeFileOptions(copts) } runtime.LockOSThread() |