tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm

Elijah Newren committed over 1 year ago

merge-recursive.[ch]: thoroughly debug these

Elijah Newren committed over 1 year ago

merge, sequencer: switch recursive merges over to ort

Elijah Newren committed over 1 year ago

sequencer: switch non-recursive merges over to ort

Elijah Newren committed over 1 year ago

merge-ort: enable diff-algorithms other than histogram

Elijah Newren committed over 1 year ago

builtin/merge-recursive: switch to using merge_ort_generic()

Elijah Newren committed over 1 year ago

checkout: replace merge_trees() with merge_ort_nonrecursive()

Elijah Newren committed over 1 year ago

The fourth batch

Junio C Hamano committed over 1 year ago

Merge branch 'dk/vimdiff-doc-fix'

Junio C Hamano committed over 1 year ago

Merge branch 'fr/vimdiff-layout-fixes'

Junio C Hamano committed over 1 year ago

Merge branch 'es/meson-build-skip-coccinelle'

Junio C Hamano committed over 1 year ago

Merge branch 'ta/bulk-checkin-signed-compare-false-warning-fix'

Junio C Hamano committed over 1 year ago

Merge branch 'rs/clear-commit-marks-simplify'

Junio C Hamano committed over 1 year ago

Merge branch 'tb/incremental-midx-part-2'

Junio C Hamano committed over 1 year ago

Merge branch 'ps/reftable-sans-compat-util'

Junio C Hamano committed over 1 year ago

Merge branch 'ps/ci-meson-check-build-docs'

Junio C Hamano committed over 1 year ago

Merge branch 'tb/http-curl-keepalive'

Junio C Hamano committed over 1 year ago

Merge branch 'tb/refspec-fetch-cleanup'

Junio C Hamano committed over 1 year ago

Merge branch 'ms/reftable-block-writer-errors'

Junio C Hamano committed over 1 year ago

Merge branch 'en/assert-wo-side-effects'

Junio C Hamano committed over 1 year ago