Commit 30a94ab75687ae52ad4f9081831110b10dbd82ca
2015-12-24T22:52:23
merge driver: allow custom default driver Allow merge users to configure a custom default merge driver via `git_merge_options`. Similarly, honor the `merge.default` configuration option.