merge-recursive: Fix D/F conflicts
[gitweb.git] / compat / vcbuild / include / netinet /
drwxr-xr-x   parent (dest: compat/vcbuild/include; base: 3734893)
-rw-r--r-- 65 in.h
-rw-r--r-- 65 tcp.h