···6565 to discourage its use by interactive users. Add documentation to
6666 help tool writers.
67676868+ * "git apply --3way" learned to take "--ours" and other options.
6969+7070+6871Performance, Internal Implementation, Development Support etc.
6972--------------------------------------------------------------
7073···241244 * Other code cleanup, docfix, build fix, etc.
242245 (merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
243246 (merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint).
247247+ (merge 4460e052e0 jc/range-diff-lazy-setup later to maint).