From: Jiang Xin <worldhello.net@gmail.com>
Date: Fri, 16 Feb 2024 01:39:06 +0000 (+0800)
Subject: Merge branch 'master' of github.com:git/git
X-Git-Tag: v2.44.0-rc2~2^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c68ee9b9cc322b3f2fe5921150def5c7f511e1ff;p=thirdparty%2Fgit.git

Merge branch 'master' of github.com:git/git

* 'master' of github.com:git/git:
  diff: mark param1 and param2 as placeholders
---

c68ee9b9cc322b3f2fe5921150def5c7f511e1ff