diff options
| -rw-r--r-- | src/merge.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/merge.c b/src/merge.c index 1c55e797b..a9108be31 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1610,13 +1610,7 @@ static int merge_normalize_opts( opts->metric->buffer_signature = git_diff_find_similar__hashsig_for_buf; opts->metric->free_signature = git_diff_find_similar__hashsig_free; opts->metric->similarity = git_diff_find_similar__calc_similarity; - - if (opts->flags & GIT_DIFF_FIND_IGNORE_WHITESPACE) - opts->metric->payload = (void *)GIT_HASHSIG_IGNORE_WHITESPACE; - else if (opts->flags & GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE) - opts->metric->payload = (void *)GIT_HASHSIG_NORMAL; - else - opts->metric->payload = (void *)GIT_HASHSIG_SMART_WHITESPACE; + opts->metric->payload = (void *)GIT_HASHSIG_SMART_WHITESPACE; } return 0; |