diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-13 15:52:21 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:43:41 -0400 |
| commit | aa3af01db0ab89d6ae56e9656dc28590142fbcc3 (patch) | |
| tree | 5ca0937ce51a6cde742de3db35f4f42c6a75400f /src/iterator.h | |
| parent | c7f94123569e8fe00ffb3a35e6a12b6ebe9320ec (diff) | |
| download | libgit2-aa3af01db0ab89d6ae56e9656dc28590142fbcc3.tar.gz | |
index iterator: optionally include conflicts
Diffstat (limited to 'src/iterator.h')
| -rw-r--r-- | src/iterator.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/iterator.h b/src/iterator.h index 1520bffc2..db1f325a7 100644 --- a/src/iterator.h +++ b/src/iterator.h @@ -33,6 +33,8 @@ typedef enum { GIT_ITERATOR_DONT_AUTOEXPAND = (1u << 3), /** convert precomposed unicode to decomposed unicode */ GIT_ITERATOR_PRECOMPOSE_UNICODE = (1u << 4), + /** include conflicts */ + GIT_ITERATOR_INCLUDE_CONFLICTS = (1u << 5), } git_iterator_flag_t; typedef struct { |