summaryrefslogtreecommitdiff
path: root/t/t3031-merge-criscross.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 11:55:31 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 11:55:31 -0700
commit05a6d0e9d08995378e7a37048d60fbae428106fb (patch)
treedba5583808d2db4794064bd5e61943b522552fcf /t/t3031-merge-criscross.sh
parentf7fb6e21b8f392f97fd35da41a31078fe6641b2a (diff)
parentc6c9e1885c9025f2e4074105e4fbe9b008e5d1a3 (diff)
downloadgit-05a6d0e9d08995378e7a37048d60fbae428106fb.tar.gz
Merge branch 'js/nedmalloc-gcc6-warnings' into maint
Squelch compiler warnings for netmalloc (in compat/) library. * js/nedmalloc-gcc6-warnings: nedmalloc: work around overzealous GCC 6 warning nedmalloc: fix misleading indentation
Diffstat (limited to 't/t3031-merge-criscross.sh')
0 files changed, 0 insertions, 0 deletions