diff options
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() |
