Commit b8c508087b5c7acf17d5fc67ab9fce6c5ab752a6

Shawn Landden 2015-03-20T10:18:12

fix changelog

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c09582..0a1c73e 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