jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Fix format

This commit is contained in:
David Calavera 2014-05-30 15:11:25 -07:00
parent 55fd4b378f
commit a44d46c33a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge.go
View File

@ -166,7 +166,7 @@ func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, erro
} }
ptr := unsafe.Pointer(&gmerge_head_array[0]) ptr := unsafe.Pointer(&gmerge_head_array[0])
var analysis C.git_merge_analysis_t var analysis C.git_merge_analysis_t
var preference C.git_merge_preference_t 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))) err := C.git_merge_analysis(&analysis, &preference, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads)))
if err < 0 { if err < 0 {
return MergeAnalysisNone, MakeGitError(err) return MergeAnalysisNone, MakeGitError(err)