diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-01-14 10:19:28 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-01-14 10:19:28 -0600 |
| commit | 85880693d53d401aac71705fe55c406b82de6f0d (patch) | |
| tree | 0707c79af3eda662b20410aeb3dee2142e14066e /src/merge.c | |
| parent | e6911dff9d6483a6afae4d1138151a1bc9116354 (diff) | |
| parent | b3837d4d2bbcae16a32deb732afa0e7e2e9b274e (diff) | |
| download | libgit2-85880693d53d401aac71705fe55c406b82de6f0d.tar.gz | |
Merge branch 'pr/2740'
Diffstat (limited to 'src/merge.c')
| -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 7031efcc7..7c38b5692 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1612,13 +1612,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; |