merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[git] / contrib / convert-objects /
drwxr-xr-x   ..
-rw-r--r-- 7436 convert-objects.c
-rw-r--r-- 456 git-convert-objects.txt