Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
[gitweb.git] / contrib / hg-to-git /
drwxr-xr-x   parent (dest: contrib; base: 174f9e622fde6c874ba3d53eb05d0f37d6001ba5)
-rwxr-xr-x 8074 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt