git/builtin
Carlo Marcelo Arenas Belón 00e302da76 builtin/merge: avoid -Wformat-extra-args from ancient Xcode
d540b70c85 (merge: cleanup messages like commit, 2019-04-17) adds
a way to change part of the helper text using a single call to
strbuf_add_commented_addf but with two formats with varying number
of parameters.

this trigger a warning in old versions of Xcode (ex 8.0), so use
instead two independent calls with a matching number of parameters

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-08-09 09:48:01 -07:00
..
2019-02-06 22:05:23 -08:00
2019-03-07 09:59:52 +09:00
2019-03-07 09:59:54 +09:00
2019-02-06 22:05:23 -08:00
2019-01-29 12:47:54 -08:00
2019-02-06 22:05:23 -08:00
2018-10-19 13:34:02 +09:00
2019-03-20 15:16:06 +09:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-04-18 13:49:29 +09:00
2019-01-18 13:49:52 -08:00
2018-10-19 13:34:02 +09:00
2018-05-29 00:28:22 +09:00
2019-03-07 09:59:52 +09:00