diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-11-26 10:32:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-26 10:32:40 -0800 |
| commit | 1b93acd13a18e8a08c8255fa193b62ed53f29ee7 (patch) | |
| tree | b6eb56f80a53a0eae8aeb6d0a73b3b4657056399 /merge-ort.c | |
| parent | 716e871d50dc63a6f436442b127571b9268a75a3 (diff) | |
| parent | ffffb987fcd3b3d6b88aceed87000ef4a5b6114e (diff) | |
Merge branch 'ad/blame-diff-algorithm'
"git blame" learns "--diff-algorithm=<algo>" option.
* ad/blame-diff-algorithm:
blame: make diff algorithm configurable
xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index a1f3333e44..9e85a5e60a 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -5523,7 +5523,6 @@ int parse_merge_opt(struct merge_options *opt, const char *s) if (value < 0) return -1; /* clear out previous settings */ - DIFF_XDL_CLR(opt, NEED_MINIMAL); opt->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK; opt->xdl_opts |= value; } |