diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/merge.c b/src/merge.c index 8554bf02b..04c74212a 100644 --- a/src/merge.c +++ b/src/merge.c @@ -527,9 +527,6 @@ static int merge_conflict_resolve_automerge( *resolved = 0; - if (merge_file_favor == GIT_MERGE_FILE_FAVOR_NO_MERGE) - return 0; - merge_file_opts.favor = merge_file_favor; /* Reject D/F conflicts */ @@ -603,16 +600,14 @@ static int merge_conflict_resolve( if ((error = merge_conflict_resolve_trivial(&resolved, diff_list, conflict)) < 0) goto done; - if (merge_file_favor != GIT_MERGE_FILE_FAVOR_NO_MERGE) { - if (!resolved && (error = merge_conflict_resolve_one_removed(&resolved, diff_list, conflict)) < 0) - goto done; + if (!resolved && (error = merge_conflict_resolve_one_removed(&resolved, diff_list, conflict)) < 0) + goto done; - if (!resolved && (error = merge_conflict_resolve_one_renamed(&resolved, diff_list, conflict)) < 0) - goto done; + if (!resolved && (error = merge_conflict_resolve_one_renamed(&resolved, diff_list, conflict)) < 0) + goto done; - if (!resolved && (error = merge_conflict_resolve_automerge(&resolved, diff_list, conflict, merge_file_favor)) < 0) - goto done; - } + if (!resolved && (error = merge_conflict_resolve_automerge(&resolved, diff_list, conflict, merge_file_favor)) < 0) + goto done; *out = resolved; |