Merge branch 'master' of github.com:git/git
commitc68ee9b9cc322b3f2fe5921150def5c7f511e1ff
authorJiang Xin <worldhello.net@gmail.com>
Fri, 16 Feb 2024 01:39:06 +0000 (16 09:39 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Fri, 16 Feb 2024 01:39:06 +0000 (16 09:39 +0800)
tree57fa78609d77167fdf32a7d7db82659a8861fe4a
parentf98643fcb247a3613291d70f6f8e6f80b359c56b
parent3e0d3cd5c7def4808247caf168e17f2bbf47892b
Merge branch 'master' of github.com:git/git

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