From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Aug 2021 23:06:02 +0000 (-0700)
Subject: Merge branch 'cb/builtin-merge-format-string-fix'
X-Git-Tag: v2.34.0-rc0~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=669277c551604fddcb4dc9dac888cd956cccacd3;p=thirdparty%2Fgit.git

Merge branch 'cb/builtin-merge-format-string-fix'

Code clean-up.

* cb/builtin-merge-format-string-fix:
  builtin/merge: avoid -Wformat-extra-args from ancient Xcode
---

669277c551604fddcb4dc9dac888cd956cccacd3