summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Landden <shawnlandden@gmail.com>2015-03-20 10:18:12 -0700
committerShawn Landden <shawnlandden@gmail.com>2015-03-20 10:18:12 -0700
commitb8c508087b5c7acf17d5fc67ab9fce6c5ab752a6 (patch)
tree759b028e22db94f60748eec83e04cb337c773869
parent8311db0cf8ae15b46edd14358a8238862e0bac4d (diff)
downloadlibgit2-b8c508087b5c7acf17d5fc67ab9fce6c5ab752a6.tar.gz
fix changelog
-rw-r--r--CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c095829b..0a1c73e8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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