compat / vcbuild / include / sys / param.hon commit rebase: implement --merge via the interactive machinery (68aa495)
   1/* Intentionally empty file to support building git with MSVC */