diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-19 20:03:13 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-20 17:15:14 -0500 |
| commit | 0e1ba46cfbca0eec00d8af713fc2059158685381 (patch) | |
| tree | 3459e9cbf5ea9b399c7467cf59b48b3f8d2a8a53 /src/merge.c | |
| parent | 6891a862bbde86f9262c4b367effb1e29d7c513b (diff) | |
| download | libgit2-0e1ba46cfbca0eec00d8af713fc2059158685381.tar.gz | |
Remove the "merge none" flag
The "merge none" (don't automerge) flag was only to aide in
merge trivial tests. We can easily determine whether merge
trivial resulted in a trivial merge or an automerge by examining
the REUC after automerge has completed.
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; |