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