diff options
| author | Vicent Marti <vicent@github.com> | 2014-05-02 09:50:15 -0700 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-05-02 09:50:15 -0700 |
| commit | 272b462db7cfb50c1ab69e1edda214b21f242ae5 (patch) | |
| tree | 13c7a7ef6e7ef1e6d90949e60a3d4677ef9096e4 /include/git2/merge.h | |
| parent | 9862ef8ef8ffd95a74be8082acab9fea0de85edb (diff) | |
| parent | 99dfa470398b9c4e06e5a5ee61868d3b9e21b26e (diff) | |
| download | libgit2-272b462db7cfb50c1ab69e1edda214b21f242ae5.tar.gz | |
Merge pull request #2308 from libgit2/rb/diff-update-index-stat-cache
Reduce excessive OID calculation for diff and stat
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 6d97e81e6..ef2dc3804 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -57,7 +57,7 @@ typedef struct { */ GIT_EXTERN(int) git_merge_file_init_input( git_merge_file_input *opts, - int version); + unsigned int version); /** * Flags for `git_merge_tree` options. A combination of these flags can be @@ -164,7 +164,7 @@ typedef struct { */ GIT_EXTERN(int) git_merge_file_init_options( git_merge_file_options *opts, - int version); + unsigned int version); typedef struct { /** @@ -232,7 +232,7 @@ typedef struct { */ GIT_EXTERN(int) git_merge_init_options( git_merge_options *opts, - int version); + unsigned int version); /** * The results of `git_merge_analysis` indicate the merge opportunities. |