From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:23 +0000 (-0700)
Subject: Merge branch 'cb/builtin-merge-format-string-fix' into maint
X-Git-Tag: v2.33.1~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a0699bccc03e83b90ace5d170686d3c28e7237f;p=thirdparty%2Fgit.git

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

Code clean-up.

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

6a0699bccc03e83b90ace5d170686d3c28e7237f