merge: detect delete/modechange conflict
[gitweb.git] / contrib / hg-to-git /
drwxr-xr-x   parent (dest: contrib; base: 72fac66bca302dbecbe42dfa0ddc7e42db2fe567)
-rwxr-xr-x 8074 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt