diff options
| author | Carlos Martín Nieto <[email protected]> | 2015-09-18 10:52:37 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2015-09-18 10:52:37 +0200 |
| commit | 0522886781055d59b780e00fddf3c8f7c9e118dc (patch) | |
| tree | 797b7644292addcd518dbfea092aa9f3fd1e1e6c /merge.go | |
| parent | b3e7705c48f038ef335204a2a9e1ee829784c30e (diff) | |
| parent | ebf7f15bf9c585102b1c39f6bec5f61a37d18802 (diff) | |
Merge remote-tracking branch 'origin/master' into next
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() |