t6036: add a failed conflict detection case with submodule add/add
[gitweb.git] / contrib / fast-import /
drwxr-xr-x   parent (dest: contrib; base: a79968bed184029139ddcd0a4e8171a2c84852ee)
-rwxr-xr-x 1451 git-import.perl
-rwxr-xr-x 724 git-import.sh
-rw-r--r-- 476 git-p4.README
-rwxr-xr-x 11140 import-directories.perl
-rwxr-xr-x 6197 import-tars.perl
-rwxr-xr-x 2241 import-zips.py