Skip to content

G
git2
Commit d8f984bc by Simon Byrne
Options

move git_merge_options changes to correct location

parent 31c78299
Showing with 4 additions and 4 deletions
CHANGELOG.md
...@@ -153,6 +153,10 @@ v0.25 ...@@ -153,6 +153,10 @@ v0.25
* `git_remote_connect()` now accepts `git_proxy_options` argument, and * `git_remote_connect()` now accepts `git_proxy_options` argument, and
`git_fetch_options` and `git_push_options` each have a `proxy_opts` field. `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 v0.24
------- -------
...@@ -228,10 +232,6 @@ v0.24 ...@@ -228,10 +232,6 @@ v0.24
### Breaking API changes ### 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, * 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 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 now prefixed with `GIT_MERGE_FLAG`, and the `tree_flags` field of the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment