compat / vcbuild / include / sys / time.hon commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1/* Intentionally empty file to support building git with MSVC */