From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Mar 2023 22:03:11 +0000 (-0700)
Subject: Merge branch 'as/doc-markup-fix'
X-Git-Tag: v2.41.0-rc0~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f3bb90c8f86279f4708f6b91e90216b285ca599;p=thirdparty%2Fgit.git

Merge branch 'as/doc-markup-fix'

Fix for a mis-mark-up in doc made in Git 2.39 days.

* as/doc-markup-fix:
  git-merge-tree.txt: replace spurious HTML entity
---

3f3bb90c8f86279f4708f6b91e90216b285ca599