merge.h in rugged-0.23.0b2

- old
+ new

@@ -167,11 +167,11 @@
 	const char *their_label;
 
 	/** 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;
 
 #define GIT_MERGE_FILE_OPTIONS_VERSION 1
 #define GIT_MERGE_FILE_OPTIONS_INIT {GIT_MERGE_FILE_OPTIONS_VERSION}
@@ -244,9 +244,10 @@
 	git_diff_similarity_metric *metric;
 
 	/** 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;
 
 #define GIT_MERGE_OPTIONS_VERSION 1
 #define GIT_MERGE_OPTIONS_INIT {GIT_MERGE_OPTIONS_VERSION}