From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Jun 2024 22:53:11 +0000 (-0700)
Subject: Merge branch 'vd/doc-merge-tree-x-option' into maint-2.45
X-Git-Tag: v2.45.3~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abfdc596d871e8b437c7ae9ac5184eb836ba1a77;p=thirdparty%2Fgit.git

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
---

abfdc596d871e8b437c7ae9ac5184eb836ba1a77