diff options
Diffstat (limited to 'include/git2/index.h')
| -rw-r--r-- | include/git2/index.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/git2/index.h b/include/git2/index.h index bca9791c5..1efca72b5 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -431,6 +431,13 @@ GIT_EXTERN(int) git_index_conflict_remove(git_index *index, const char *path); */ GIT_EXTERN(void) git_index_conflict_cleanup(git_index *index); +/** + * Determine if the index contains entries representing file conflicts. + * + * @return 1 if at least one conflict is found, 0 otherwise. + */ +GIT_EXTERN(int) git_index_has_conflicts(git_index *index); + /**@}*/ /** @name Resolve Undo (REUC) index entry manipulation. |