diff options
| author | Edward Thomson <ethomson@github.com> | 2017-01-01 22:19:23 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2017-01-01 22:34:43 +0000 |
| commit | 19ed4d0ca3fdd2f46e1391597aa2b70e4f330c6f (patch) | |
| tree | 8d6c7e9202b2f0c9a0d0f7771fa1afe8fd224fa7 /include/git2 | |
| parent | 805b90aac4a0bc4a388a28f0086ba8a7cf7e62dc (diff) | |
| download | libgit2-19ed4d0ca3fdd2f46e1391597aa2b70e4f330c6f.tar.gz | |
merge: set default rename threshold
When `GIT_MERGE_FIND_RENAMES` is set, provide a default for
`rename_threshold` when it is unset.
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/merge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index c6f6cba6c..94ac8b5c5 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -290,7 +290,8 @@ typedef struct { } git_merge_options; #define GIT_MERGE_OPTIONS_VERSION 1 -#define GIT_MERGE_OPTIONS_INIT {GIT_MERGE_OPTIONS_VERSION} +#define GIT_MERGE_OPTIONS_INIT { \ + GIT_MERGE_OPTIONS_VERSION, GIT_MERGE_FIND_RENAMES } /** * Initializes a `git_merge_options` with default values. Equivalent to |