diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2015-03-12 12:36:09 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2015-03-16 09:53:27 +0200 |
| commit | 13de93631664cd6eec3afedabb7145d5562a3e01 (patch) | |
| tree | af7eadb3ace1e871f458156bf7524b0c4fcf1f6a /src/merge.c | |
| parent | f29dde682866c293292ce405fcfef1511ced3f55 (diff) | |
| download | libgit2-13de93631664cd6eec3afedabb7145d5562a3e01.tar.gz | |
Collapse whitespace flags into git_merge_file_flags_t
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/merge.c b/src/merge.c index 12e85ffa8..c0dd2b694 100644 --- a/src/merge.c +++ b/src/merge.c @@ -654,7 +654,7 @@ static int merge_conflict_resolve_automerge( git_merge_diff_list *diff_list, const git_merge_diff *conflict, unsigned int merge_file_favor, - unsigned int whitespace_flags) + unsigned int file_flags) { const git_index_entry *ancestor = NULL, *ours = NULL, *theirs = NULL; git_merge_file_options opts = GIT_MERGE_FILE_OPTIONS_INIT; @@ -709,7 +709,7 @@ static int merge_conflict_resolve_automerge( &conflict->their_entry : NULL; opts.favor = merge_file_favor; - opts.whitespace_flags = whitespace_flags; + opts.flags = file_flags; if ((error = git_repository_odb(&odb, diff_list->repo)) < 0 || (error = git_merge_file_from_index(&result, diff_list->repo, ancestor, ours, theirs, &opts)) < 0 || @@ -744,7 +744,7 @@ static int merge_conflict_resolve( git_merge_diff_list *diff_list, const git_merge_diff *conflict, unsigned int merge_file_favor, - unsigned int whitespace_flags) + unsigned int file_flags) { int resolved = 0; int error = 0; @@ -761,7 +761,7 @@ static int merge_conflict_resolve( goto done; if (!resolved && (error = merge_conflict_resolve_automerge(&resolved, diff_list, conflict, - merge_file_favor, whitespace_flags)) < 0) + merge_file_favor, file_flags)) < 0) goto done; *out = resolved; @@ -1783,7 +1783,7 @@ int git_merge_trees( git_vector_foreach(&changes, i, conflict) { int resolved = 0; - if ((error = merge_conflict_resolve(&resolved, diff_list, conflict, opts.file_favor, opts.whitespace_flags)) < 0) + if ((error = merge_conflict_resolve(&resolved, diff_list, conflict, opts.file_favor, opts.file_flags)) < 0) goto done; if (!resolved) |