compat / win32 / alloca.hon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1#include <malloc.h>