merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / hg-to-git /
drwxr-xr-x   parent (dest: contrib; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rwxr-xr-x 8021 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt