CHANGELOG.md
25.4 KB
-
merge driver: allow custom default driver · 30a94ab7
Allow merge users to configure a custom default merge driver via `git_merge_options`. Similarly, honor the `merge.default` configuration option.
Edward Thomson committed
To find the state of this project's repository at the time of any of these versions, check out
the tags.