diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2015-03-12 12:29:47 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2015-03-16 09:53:27 +0200 |
| commit | f29dde682866c293292ce405fcfef1511ced3f55 (patch) | |
| tree | 7a75fd6c5e4c907f44776ee88236c8a98438ff73 /include/git2 | |
| parent | 0f24cac2b926e4842f6890ee1712ac2d85cc020c (diff) | |
| download | libgit2-f29dde682866c293292ce405fcfef1511ced3f55.tar.gz | |
Renamed git_merge_options 'flags' to 'tree_flags'
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/merge.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 73375b319..387197a40 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -63,7 +63,7 @@ GIT_EXTERN(int) git_merge_file_init_input( /** * Flags for `git_merge_tree` options. A combination of these flags can be - * passed in via the `flags` value in the `git_merge_options`. + * passed in via the `tree_flags` value in the `git_merge_options`. */ typedef enum { /** @@ -225,7 +225,7 @@ typedef struct { */ typedef struct { unsigned int version; - git_merge_tree_flag_t flags; + git_merge_tree_flag_t tree_flags; /** * Similarity to consider a file renamed (default 50). If |