Commit a3f693e9a1d2dae093c08f54103e336e52ab7eba

Edward Thomson 2015-03-20T16:57:32

Merge pull request #3003 from shawnl/master 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