merge-recursive: Save D/F conflict filenames instead of unlinking them
[gitweb.git] / compat / win32 /
drwxr-xr-x   parent (dest: compat; base: 70cc3d36eba58f8bf177c91d82781fb727a9a4fa)
-rw-r--r-- 2439 dirent.c
-rw-r--r-- 504 dirent.h
-rw-r--r-- 5377 pthread.c
-rw-r--r-- 2691 pthread.h
drwxr-xr-x - sys
-rw-r--r-- 1315 syslog.c
-rw-r--r-- 397 syslog.h