merge.h in rugged-0.25.0b3

- old
+ new

@@ -271,10 +271,19 @@
 	 * limit is reached, the next ancestor will simply be used instead of
 	 * attempting to merge it.  The default is unlimited.
 	 */
 	unsigned int recursion_limit;
 
-	/** Flags for handling conflicting content. */
+	/**
+	 * Default merge driver to be used when both sides of a merge have
+	 * changed.  The default is the `text` driver.
+	 */
+	const char *default_driver;
+
+	/**
+	 * Flags for handling conflicting content, to be used with the standard
+	 * (`text`) merge driver.
+	 */
 	git_merge_file_favor_t file_favor;
 
 	/** see `git_merge_file_flag_t` above */
 	git_merge_file_flag_t file_flags;
 } git_merge_options;