merge: detect delete/modechange conflict
[gitweb.git] / contrib / convert-objects /
drwxr-xr-x   parent (dest: contrib; base: 72fac66bca302dbecbe42dfa0ddc7e42db2fe567)
-rw-r--r-- 7436 convert-objects.c
-rw-r--r-- 464 git-convert-objects.txt