merge-recursive: comment and reorder the merge_options fields
[git] / compat / win32 / alloca.h
1 #include <malloc.h>