Merge branch 'jc/merge-symlink-ours-theirs'
[gitweb.git] / contrib / mw-to-git / t / install-wiki /
drwxr-xr-x   parent (dest: contrib/mw-to-git/t; base: 14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115)
-rw-r--r-- 4390 LocalSettings.php
-rw-r--r-- 3594 db_install.php