merge_file(): add comment explaining behavior wrt conflict style
[git/kirr.git] / compat / win32 / 
tree24074f9a5b255fbc4693a2c98dd70f8e5000f7ac
drwxr-xr-x   ..
-rw-r--r-- 5242 pthread.c
-rw-r--r-- 1888 pthread.h