From 37bb1a6025eac8b1e689686f8830a20a266394cf Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Wed, 12 Aug 2015 10:21:49 +0200
Subject: merge: fix memory leak related to merge file opts

---
 merge.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'merge.go')

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()
-- 
cgit v1.2.3