Merge branch 'dp/merge-strategy-doc-fix'
[git] / compat / win32 / alloca.h
1 #include <malloc.h>