Merge branch 'jc/merge-x-theirs-docfix' into maint
[git] / compat / win32 / alloca.h
1 #include <malloc.h>