compat / vcbuild / include / sys / time.hon commit rerere: recalculate conflict ID when unresolved conflict is committed (bd7dfa5)
   1/* Intentionally empty file to support building git with MSVC */