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

Additions #179

Merged
schani merged 4 commits from master into master 2015-04-27 16:29:49 -05:00
Conversation 0 Commits 4 Files Changed 3 +1
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b3e7304abf - Show all commits

1
index.go
View File

@ -287,6 +287,7 @@ func (v *Index) HasConflicts() bool {
return C.git_index_has_conflicts(v.ptr) != 0 return C.git_index_has_conflicts(v.ptr) != 0
} }
// FIXME: this might return an error
func (v *Index) CleanupConflicts() { func (v *Index) CleanupConflicts() {
C.git_index_conflict_cleanup(v.ptr) C.git_index_conflict_cleanup(v.ptr)
} }