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