compat / vcbuild / include / inttypes.hon commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1/* Intentionally empty file to support building git with MSVC */