Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1
[gitweb.git] / contrib / hg-to-git /
drwxr-xr-x   parent (dest: contrib; base: d9b04430d238be1fe75ef97e3455c65ca72a7fa0)
-rwxr-xr-x 7868 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt