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-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=669277c551604fddcb4dc9dac888cd956cccacd3;p=rit

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