summaryrefslogtreecommitdiff
path: root/include/git2/merge.h
diff options
context:
space:
mode:
authorJameson Miller <jamill@microsoft.com>2015-04-30 10:57:13 -0400
committerJameson Miller <jamill@microsoft.com>2015-04-30 10:59:50 -0400
commitbf2ba5290aad5d058c8a28ec50703bbb977b5bb4 (patch)
tree8594e35f8e569493a300313d1296d631d617fa37 /include/git2/merge.h
parent891cc5045f613955c6f766f1875a024483b3b972 (diff)
downloadlibgit2-jamill/doc_update.tar.gz
Update documentation for API changesjamill/doc_update
Diffstat (limited to 'include/git2/merge.h')
-rw-r--r--include/git2/merge.h3
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;