From 07bb8078cbea77e3d85bf087e2510c2e23d8fa29 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@github.com>
Date: Sat, 14 Jan 2017 16:01:53 +0000
Subject: CHANGELOG: update `GIT_MERGE_OPTIONS_INIT` changes

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8544ac451..9e60424ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ v0.25 + 1
 
 ### Changes or improvements
 
+* `GIT_MERGE_OPTIONS_INIT` now includes a setting to perform rename detection.
+  This aligns this structure with the default by `git_merge` and
+  `git_merge_trees` when `NULL` was provided for the options.
+
 ### API additions
 
 ### API removals
-- 
cgit v1.2.1