diff options
| author | Simon Byrne <simonbyrne@gmail.com> | 2017-01-03 10:54:24 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2017-01-06 12:34:17 +0000 |
| commit | 73bf857db166975c74611c5adfe5fb849fec0b60 (patch) | |
| tree | f2ac8012cc46d6112364ad7bb1b7c0ef7c0550bf | |
| parent | 0919936ed8c84a41fd3ec510e2c8f7e623b1c192 (diff) | |
| download | libgit2-ethomson/025_relnotes.tar.gz | |
move git_merge_options changes to correct locationethomson/025_relnotes
| -rw-r--r-- | CHANGELOG.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 69ebd3a2b..3a8db068f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -153,6 +153,10 @@ v0.25 * `git_remote_connect()` now accepts `git_proxy_options` argument, and `git_fetch_options` and `git_push_options` each have a `proxy_opts` field. +* `git_merge_options` now provides a `default_driver` that can be used + to provide the name of a merge driver to be used to handle files changed + during a merge. + v0.24 ------- @@ -228,10 +232,6 @@ v0.24 ### Breaking API changes -* `git_merge_options` now provides a `default_driver` that can be used - to provide the name of a merge driver to be used to handle files changed - during a merge. - * The `git_merge_tree_flag_t` is now `git_merge_flag_t`. Subsequently, its members are no longer prefixed with `GIT_MERGE_TREE_FLAG` but are now prefixed with `GIT_MERGE_FLAG`, and the `tree_flags` field of the |