Merge branch 'vd/doc-merge-tree-x-option' into maint-2.45

Doc update. * vd/doc-merge-tree-x-option: Documentation/git-merge-tree.txt: document -X

Junio C Hamano committed Jun 28, 2024 at 15:53 UTC abfdc596d871e8b437c7ae9ac5184eb836ba1a77

No changes.