From b8c508087b5c7acf17d5fc67ab9fce6c5ab752a6 Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Fri, 20 Mar 2015 10:18:12 -0700 Subject: [PATCH] fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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