Merge branch 'nd/remote-plural-ours-plus-theirs'
[git] / contrib / hg-to-git /
drwxr-xr-x   ..
-rwxr-xr-x 8074 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt