Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
[git] / compat / win32 / alloca.h
1 #include <malloc.h>