From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Jan 2025 16:44:55 +0000 (-0800)
Subject: Merge branch 'mh/gitattr-doc-markup-fix'
X-Git-Tag: v2.49.0-rc0~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73c152e6106c3ead1f15f920f4b4f4c38fbfcdb3;p=thirdparty%2Fgit.git

Merge branch 'mh/gitattr-doc-markup-fix'

Doc markup fix.

* mh/gitattr-doc-markup-fix:
  docs: fix typesetting of merge driver placeholders
---

73c152e6106c3ead1f15f920f4b4f4c38fbfcdb3