compat / vcbuild / include / termios.hon commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1/* Intentionally empty file to support building git with MSVC */