diff options
| author | Carlos Martín Nieto <[email protected]> | 2015-04-27 23:29:49 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2015-04-27 23:29:49 +0200 |
| commit | f7781c0e0004f76833c6be93409320b5c143e0c8 (patch) | |
| tree | 791b5f551780a5fc963316dac4976780def878c3 /index.go | |
| parent | 9538c7f750dafaf3752e04b1c1747d7984ca31d0 (diff) | |
| parent | b3e7304abf6f0c4ef50e973acb220c40a5ddac86 (diff) | |
Merge pull request #179 from schani/master
Additions
Diffstat (limited to 'index.go')
| -rw-r--r-- | index.go | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -287,6 +287,7 @@ func (v *Index) HasConflicts() bool { return C.git_index_has_conflicts(v.ptr) != 0 } +// FIXME: this might return an error func (v *Index) CleanupConflicts() { C.git_index_conflict_cleanup(v.ptr) } |
