diff options
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; } |