From 431380f8c5466de33e05ff53717877273ee9f588 Mon Sep 17 00:00:00 2001 From: Aguacero Date: Thu, 29 May 2014 09:38:40 +0400 Subject: [PATCH] To Initialize `preference` makes no sense --- merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge.go b/merge.go index 667b48b..52d2e0c 100644 --- a/merge.go +++ b/merge.go @@ -166,7 +166,7 @@ func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, erro } ptr := unsafe.Pointer(&gmerge_head_array[0]) var analysis C.git_merge_analysis_t - var preference C.git_merge_preference_t = C.GIT_MERGE_PREFERENCE_NONE + var preference C.git_merge_preference_t err := C.git_merge_analysis(&analysis, &preference, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads))) if err < 0 { return MergeAnalysisNone, MakeGitError(err)