test that git status works with merge conflict in, .gitmodules
[gitweb.git] / contrib / hg-to-git /
drwxr-xr-x   parent (dest: contrib; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rwxr-xr-x 7867 hg-to-git.py
-rw-r--r-- 890 hg-to-git.txt