Merge pull request #3090 from libgit2/jamill/doc_update

Update documentation for API changes

CHANGELOG.md

@@ -67,6 +67,8 @@ support for HTTPS connections insead of OpenSSL.
 
 ### Breaking API changes
 
+* `git_smart_subtransport_cb` now has a `param` parameter.
+
 * The `git_merge_options` structure member `flags` has been renamed
   to `tree_flags`.
 

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;