aboutsummaryrefslogtreecommitdiffstats
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-06-08 14:27:52 -0700
committerJunio C Hamano <gitster@pobox.com>2022-06-08 14:27:52 -0700
commitd777ef9befe7cdf595981686954427d8cd6e4c4c (patch)
treec0fcf483717fdd1ac6c90bc42a35b49d5357494c /combine-diff.c
parentMerge branch 'rs/commit-summary-wo-break-rewrite' into maint (diff)
parenttests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK (diff)
downloadgit-d777ef9befe7cdf595981686954427d8cd6e4c4c.tar.gz
git-d777ef9befe7cdf595981686954427d8cd6e4c4c.zip
Merge branch 'pw/test-malloc-with-sanitize-address' into maint
Avoid problems from interaction between malloc_check and address sanitizer. source: <pull.1210.git.1649507317350.gitgitgadget@gmail.com> * pw/test-malloc-with-sanitize-address: tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions