From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Jan 2024 22:05:15 +0000 (-0800)
Subject: Merge branch 'ml/doc-merge-updates'
X-Git-Tag: v2.44.0-rc0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9decd56cc9a41773bffa517caaa07db3f78e8646;p=thirdparty%2Fgit.git

Merge branch 'ml/doc-merge-updates'

Doc update.

* ml/doc-merge-updates:
  Documentation/git-merge.txt: use backticks for command wrapping
  Documentation/git-merge.txt: fix reference to synopsis
---

9decd56cc9a41773bffa517caaa07db3f78e8646