merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / contrib / convert-objects /
drwxr-xr-x   parent (dest: contrib; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rw-r--r-- 7436 convert-objects.c
-rw-r--r-- 456 git-convert-objects.txt