From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 May 2024 16:52:54 +0000 (-0700)
Subject: Merge branch 'vd/doc-merge-tree-x-option'
X-Git-Tag: v2.46.0-rc0~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=754ae502191e3f9980b8583280c48368ee667b2c;p=thirdparty%2Fgit.git

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

Doc update.

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

754ae502191e3f9980b8583280c48368ee667b2c