]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7521-ignored-mode.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 367e9fe 00e302d)
Merge branch 'cb/builtin-merge-format-string-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:23 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:23 +0000 (13:51 -0700)
commit6a0699bccc03e83b90ace5d170686d3c28e7237f
tree24d473c4c17486b5725fd320c116da887fc9a5f4tree | snapshot
parent367e9feee21af039d03103f0781757f0e9724168commit | diff
parent00e302da76591f2bda43d9bf58bf366729ee485ccommit | diff
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
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.