merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / svn-fe /
drwxr-xr-x   parent (dest: contrib; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 2292 Makefile
-rw-r--r-- 361 svn-fe.c
-rw-r--r-- 2107 svn-fe.txt
-rwxr-xr-x 2044 svnrdump_sim.py