merge: fix memory leak related to merge file opts

1 files changed, 1 insertions, 0 deletions

diff --git a/merge.go b/merge.go
index 8c87391..183305c 100644
--- a/merge.go
+++ b/merge.go
@@ -394,6 +394,7 @@ func MergeFile(ancestor MergeFileInput, ours MergeFileInput, theirs MergeFileInp
 			return nil, MakeGitError(ecode)
 		}
 		populateCMergeFileOptions(copts, *options)
+		defer freeCMergeFileOptions(copts)
 	}
 
 	runtime.LockOSThread()