diff options
| author | Edward Thomson <ethomson@github.com> | 2017-01-14 16:01:53 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2017-01-14 16:01:53 +0000 |
| commit | 07bb8078cbea77e3d85bf087e2510c2e23d8fa29 (patch) | |
| tree | b3709cc7dc1f39ce602a692c70eb33789e25f5b6 | |
| parent | 19ed4d0ca3fdd2f46e1391597aa2b70e4f330c6f (diff) | |
| download | libgit2-ethomson/merge_opts.tar.gz | |
CHANGELOG: update `GIT_MERGE_OPTIONS_INIT` changesethomson/merge_opts
| -rw-r--r-- | CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
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 |