Merge branch 'jc/conflict-marker-size' into maint
[gitweb.git] / contrib / hg-to-git /
drwxr-xr-x   parent (dest: contrib; base: daaf2e8892cf3b652454c48ffd332e3c5b446b92)
-rwxr-xr-x 7867 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt