test that git status works with merge conflict in, .gitmodules
[gitweb.git] / contrib / convert-objects /
drwxr-xr-x   parent (dest: contrib; base: 44ca0c8ed927c8e7525ceec412704ff9967ff6ac)
-rw-r--r-- 7436 convert-objects.c
-rw-r--r-- 456 git-convert-objects.txt