diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-22 17:00:09 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:37:05 -0500 |
| commit | fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3 (patch) | |
| tree | 53dbcd502af2400529a3f8db828612d90d12cf06 /src/merge.h | |
| parent | c4f60543b7ccfce852ebdc8c12b62c99a5d4c2a5 (diff) | |
| download | libgit2-fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3.tar.gz | |
merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge.h b/src/merge.h index 3caf617c6..bd839be49 100644 --- a/src/merge.h +++ b/src/merge.h @@ -19,8 +19,8 @@ #define GIT_MERGE_MODE_FILE "MERGE_MODE" #define GIT_MERGE_FILE_MODE 0666 -#define GIT_MERGE_TREE_RENAME_THRESHOLD 50 -#define GIT_MERGE_TREE_TARGET_LIMIT 1000 +#define GIT_MERGE_DEFAULT_RENAME_THRESHOLD 50 +#define GIT_MERGE_DEFAULT_TARGET_LIMIT 1000 /** Types of changes when files are merged from branch to branch. */ typedef enum { |