diff options
Diffstat (limited to 'include/git2')
-rw-r--r-- | include/git2/merge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index d3360a7e0..5fef452b9 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -169,7 +169,7 @@ typedef struct { /** The file to favor in region conflicts. */ git_merge_file_favor_t favor; - /** Merge file flags. */ + /** see `git_merge_file_flags_t` above */ unsigned int flags; } git_merge_file_options; @@ -246,6 +246,7 @@ typedef struct { /** Flags for handling conflicting content. */ git_merge_file_favor_t file_favor; + /** see `git_merge_file_flags_t` above */ unsigned int file_flags; } git_merge_options; |