diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-12-24 22:52:23 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-03-17 11:02:27 -0400 |
| commit | 30a94ab75687ae52ad4f9081831110b10dbd82ca (patch) | |
| tree | d2dc61662c273c628218c9d2749c3c839f40d3eb /src/merge.h | |
| parent | 7d307c1edc5430dce270302d539d6eab8ed054c7 (diff) | |
| download | libgit2-30a94ab75687ae52ad4f9081831110b10dbd82ca.tar.gz | |
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.
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h index 10d77f3d8..8eaa1ad92 100644 --- a/src/merge.h +++ b/src/merge.h @@ -40,6 +40,7 @@ enum { struct git_merge_driver_source { git_repository *repo; + const char *default_driver; const git_merge_file_options *file_opts; const git_index_entry *ancestor; |