merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / mw-to-git / t / install-wiki /
drwxr-xr-x   parent (dest: contrib/mw-to-git/t; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 4390 LocalSettings.php
-rw-r--r-- 3594 db_install.php