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 /include | |
| 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 'include')
| -rw-r--r-- | include/git2/merge.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 560797a0c..c6f6cba6c 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -273,7 +273,16 @@ typedef struct { */ unsigned int recursion_limit; - /** Flags for handling conflicting content. */ + /** + * Default merge driver to be used when both sides of a merge have + * changed. The default is the `text` driver. + */ + const char *default_driver; + + /** + * Flags for handling conflicting content, to be used with the standard + * (`text`) merge driver. + */ git_merge_file_favor_t file_favor; /** see `git_merge_file_flag_t` above */ |