compat / vcbuild / include / sys / time.hon commit merge-recursive: avoid spurious rename/rename conflict from dir renames (febb3a8)
   1/* Intentionally empty file to support building git with MSVC */