From 92a1f92d912cdb5f68da8c1e5e3a4d1ebfd282db Mon Sep 17 00:00:00 2001 From: joseferminj Date: Thu, 22 Jan 2015 00:44:51 -0500 Subject: Add TargetDirectory field to Checkout options. TargetDirectory field indicates a alternative checkout path to workdir. --- merge.go | 1 + 1 file changed, 1 insertion(+) (limited to 'merge.go') diff --git a/merge.go b/merge.go index 3742f97..5b68a8b 100644 --- a/merge.go +++ b/merge.go @@ -145,6 +145,7 @@ func (r *Repository) Merge(theirHeads []*AnnotatedCommit, mergeOptions *MergeOpt cMergeOpts := mergeOptions.toC() cCheckoutOpts := checkoutOptions.toC() + defer freeCheckoutOpts(cCheckoutOpts) gmerge_head_array := make([]*C.git_annotated_commit, len(theirHeads)) for i := 0; i < len(theirHeads); i++ { -- cgit v1.2.3