diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-03 15:10:14 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-11-03 15:10:14 +0100 |
| commit | 0a629181881287fa9646a52b7249f03bd1b8cfc4 (patch) | |
| tree | 6c52c039e34a310d73ac46366e03ca7b633cb333 /include | |
| parent | 4bb8708730e81c551ca70f47ebd875f236e7998f (diff) | |
| parent | d88766c4e16c311ba8ce28e71a6545c5d0d7521f (diff) | |
| download | libgit2-0a629181881287fa9646a52b7249f03bd1b8cfc4.tar.gz | |
Merge pull request #2661 from swisspol/2656
Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/diff.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index 1013b5c33..4403944f4 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -377,8 +377,8 @@ typedef struct { /* options controlling how to diff text is generated */ - uint16_t context_lines; /**< defaults to 3 */ - uint16_t interhunk_lines; /**< defaults to 0 */ + uint32_t context_lines; /**< defaults to 3 */ + uint32_t interhunk_lines; /**< defaults to 0 */ uint16_t id_abbrev; /**< default 'core.abbrev' or 7 if unset */ git_off_t max_size; /**< defaults to 512MB */ const char *old_prefix; /**< defaults to "a" */ |