Merge branch 'vd/doc-merge-tree-x-option'

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

Junio C Hamano committed May 15, 2024 at 09:52 UTC 754ae502191e3f9980b8583280c48368ee667b2c

No changes.