merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / perl /
drwxr-xr-x   parent (dest: ; base: 2a669c341a857f53d946dec762e6f22a54b12dd2)
-rw-r--r-- 35938 Git.pm
-rw-r--r-- 1462 Makefile
-rw-r--r-- 1003 Makefile.PL
-rw-r--r-- 19088 private-Error.pm