compat / vcbuild / include / sys / param.hon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1/* Intentionally empty file to support building git with MSVC */