diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:06:03 -0700 |
| commit | 669277c551604fddcb4dc9dac888cd956cccacd3 (patch) | |
| tree | 796823188e1c01d907f37bfa4c309d1ae60ca804 /userdiff.c | |
| parent | b81a85ecd82239386fc22f5f3c6914155e029ce8 (diff) | |
| parent | 00e302da76591f2bda43d9bf58bf366729ee485c (diff) | |
| download | git-669277c551604fddcb4dc9dac888cd956cccacd3.tar.gz | |
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
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions