]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'cb/builtin-merge-format-string-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Aug 2021 23:06:02 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Aug 2021 23:06:03 +0000 (16:06 -0700)
commit669277c551604fddcb4dc9dac888cd956cccacd3
tree796823188e1c01d907f37bfa4c309d1ae60ca804
parentb81a85ecd82239386fc22f5f3c6914155e029ce8
parent00e302da76591f2bda43d9bf58bf366729ee485c
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
builtin/merge.c