compat / vcbuild / include / sys / socket.hon commit rebase docs: clarify --merge and --strategy (31ddd1e)
   1/* Intentionally empty file to support building git with MSVC */