treewide: replace assert() with ASSERT() in special cases

treewide: replace assert() with BUG_IF_NOT() in special cases

merge-ort: remove extraneous word in comment

diffcore-rename: fix BUG when break detection and --follow used together

rev-list-options.adoc: correct one --ancestry-path example

treewide: replace assert() with BUG_IF_NOT() in special cases

ci: add build checking for side-effects in assert() calls

treewide: replace assert() with BUG_IF_NOT() in special cases

ci: add build checking for side-effects in assert() calls

am: switch from merge_recursive_generic() to merge_ort_generic()

Add summarize-perf script

Add regions for preparation and xdl_merge

diffcore-rename: fix BUG when break detection and --follow used together

diffcore-rename: fix BUG when break detection and --follow used together

am: switch from merge_recursive_generic() to merge_ort_generic()

builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

merge, sequencer: make 'recursive' mean 'ort'

merge-ort: remove extraneous word in comment

merge-ort: support having merge verbosity be set to 0

builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

merge, sequencer: make 'recursive' mean 'ort'

merge-ort: support having merge verbosity be set to 0

merge, sequencer: make 'recursive' mean 'ort'

merge-ort: remove extraneous word in comment

builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

am: switch from merge_recursive_generic() to merge_ort_generic()

merge-ort: fix slightly overzealous assertion for rename-to-self

doc: clarify the intent of the renormalize option in the merge machinery

merge: reduce prevalence of nested conflicts with diff3

merge: reduce prevalence of nested conflicts with diff3