diff --git a/merge.go b/merge.go index c0304c3..667b48b 100644 --- a/merge.go +++ b/merge.go @@ -166,7 +166,8 @@ func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, erro } ptr := unsafe.Pointer(&gmerge_head_array[0]) var analysis C.git_merge_analysis_t - err := C.git_merge_analysis(&analysis, nil, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads))) + var preference C.git_merge_preference_t = C.GIT_MERGE_PREFERENCE_NONE + 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) }