merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / compat / win32 / sys /
drwxr-xr-x   parent (dest: compat/win32; base: 3c217c077a86)
-rw-r--r-- 15095 poll.c
-rw-r--r-- 1959 poll.h