diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-05-18 00:59:57 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-05-18 01:10:48 +0400 |
| commit | 0e0108f73f83c7cedeaafd480fdcfe3cd6b69d1f (patch) | |
| tree | 83b20d853d19906a3c9e6c7a590d8bedcc0fb506 /src/index.h | |
| parent | 5b3d52ce37100c1d63229d195041fac3e6f89d28 (diff) | |
introduce git_conflict_iterator
Diffstat (limited to 'src/index.h')
| -rw-r--r-- | src/index.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/index.h b/src/index.h index 2ad401741..a59107a7b 100644 --- a/src/index.h +++ b/src/index.h @@ -42,6 +42,11 @@ struct git_index { git_vector_cmp reuc_search; }; +struct git_index_conflict_iterator { + git_index *index; + size_t cur; +}; + extern void git_index_entry__init_from_stat(git_index_entry *entry, struct stat *st); extern size_t git_index__prefix_position(git_index *index, const char *path); |