merge: detect delete/modechange conflict
[gitweb.git] / contrib / mw-to-git / bin-wrapper /
drwxr-xr-x   parent (dest: contrib/mw-to-git; base: 72fac66bca302dbecbe42dfa0ddc7e42db2fe567)
-rwxr-xr-x 419 git