Merge branch 'vd/doc-merge-tree-x-option'
commit754ae502191e3f9980b8583280c48368ee667b2c
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 May 2024 16:52:54 +0000 (15 09:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 May 2024 16:52:55 +0000 (15 09:52 -0700)
tree310f487afd8def9870af41bceb9d3fe742673857
parent068df18c90c335ebe28bda285e742a6408eec3b5
parent2566a777747051eaeaaf90f3dc93bf84d2c2edeb
Merge branch 'vd/doc-merge-tree-x-option'

Doc update.

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