compat / vcbuild / include / pwd.hon commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1/* Intentionally empty file to support building git with MSVC */