cherry-pick/revert: add scissors line on merge conflict
[git] / compat / win32 / alloca.h
1 #include <malloc.h>