compat / vcbuild / include / inttypes.hon commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1/* Intentionally empty file to support building git with MSVC */