From f29dde682866c293292ce405fcfef1511ced3f55 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Thu, 12 Mar 2015 12:29:47 +0200 Subject: Renamed git_merge_options 'flags' to 'tree_flags' --- include/git2/merge.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/git2') 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 -- cgit v1.2.1