merge-recursive: Fix code checking for D/F conflicts still being present
[gitweb.git] / contrib / hg-to-git /
drwxr-xr-x   parent (dest: contrib; base: f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512)
-rwxr-xr-x 7867 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt