diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:12 -0700 |
| commit | 2e806d8464decacc307cdbfa45c98be8e28382da (patch) | |
| tree | 99f9e732b9e5a777e17bbb424f22689ecb0a4418 /merge-ort.c | |
| parent | 77c029493a671d9ee200bda42da0a3c04cdf110f (diff) | |
| download | git-2e806d8464decacc307cdbfa45c98be8e28382da.tar.gz | |
merge-ort: enable diff-algorithms other than histogram
The ort merge strategy has always used the histogram diff algorithm.
The recursive merge strategy, in contrast, defaults to the myers
diff algorithm, while allowing it to be changed.
Change the ort merge strategy to allow different diff algorithms, by
removing the hard coded value in merge_start() and instead just making
it a default in init_merge_options(). Technically, this also changes
the default diff algorithm for the recursive backend too, but we're
going to remove the final callers of the recursive backend in the next
two commits.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/merge-ort.c b/merge-ort.c index 2b7d86aa4e..14a7ae4a6b 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4957,9 +4957,6 @@ static void merge_start(struct merge_options *opt, struct merge_result *result) } trace2_region_leave("merge", "sanity checks", opt->repo); - /* Default to histogram diff. Actually, just hardcode it...for now. */ - opt->xdl_opts = DIFF_WITH_ALG(opt, HISTOGRAM_DIFF); - /* Handle attr direction stuff for renormalization */ if (opt->renormalize) git_attr_set_direction(GIT_ATTR_CHECKOUT); |