diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2015-03-12 12:29:47 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2015-03-16 09:53:27 +0200 |
| commit | f29dde682866c293292ce405fcfef1511ced3f55 (patch) | |
| tree | 7a75fd6c5e4c907f44776ee88236c8a98438ff73 /src | |
| parent | 0f24cac2b926e4842f6890ee1712ac2d85cc020c (diff) | |
| download | libgit2-f29dde682866c293292ce405fcfef1511ced3f55.tar.gz | |
Renamed git_merge_options 'flags' to 'tree_flags'
Diffstat (limited to 'src')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index 2972d9ff3..12e85ffa8 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1154,7 +1154,7 @@ int git_merge_diff_list__find_renames( assert(diff_list && opts); - if ((opts->flags & GIT_MERGE_TREE_FIND_RENAMES) == 0) + if ((opts->tree_flags & GIT_MERGE_TREE_FIND_RENAMES) == 0) return 0; similarity_ours = git__calloc(diff_list->conflicts.length, @@ -1593,7 +1593,7 @@ static int merge_normalize_opts( git_merge_options init = GIT_MERGE_OPTIONS_INIT; memcpy(opts, &init, sizeof(init)); - opts->flags = GIT_MERGE_TREE_FIND_RENAMES; + opts->tree_flags = GIT_MERGE_TREE_FIND_RENAMES; opts->rename_threshold = GIT_MERGE_TREE_RENAME_THRESHOLD; } |