merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / contrib / svn-fe /
drwxr-xr-x   parent (dest: contrib; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rw-r--r-- 1495 Makefile
-rw-r--r-- 298 svn-fe.c
-rw-r--r-- 1992 svn-fe.txt