compat / vcbuild / include / alloca.hon commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1#include <malloc.h>