From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Feb 2024 00:22:10 +0000 (-0800)
Subject: Merge branch 'ml/doc-merge-updates' into maint-2.43
X-Git-Tag: v2.43.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aea0dad70446222adf0e111aac70285a5735604;p=thirdparty%2Fgit.git

Merge branch 'ml/doc-merge-updates' into maint-2.43

Doc update.

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

3aea0dad70446222adf0e111aac70285a5735604