Merge pull request #3003 from shawnl/master

fix changelog
This commit is contained in:
Edward Thomson 2015-03-20 16:57:32 -04:00
commit a3f693e9a1

View File

@ -64,7 +64,7 @@ v0.22 + 1
* The `git_merge_options` structure member `flags` has been renamed
to `tree_flags`.
* The `git_merge_file_options` structure member `tree_flags` is now
* The `git_merge_file_options` structure member `flags` is now
an unsigned int. It was previously a `git_merge_file_flags_t`.
* `GIT_CHECKOUT_SAFE_CREATE` has been removed. Most users will generally