Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax
[gitweb.git] / contrib / fast-import /
drwxr-xr-x   parent (dest: contrib; base: ff65e796f00097c118a85ac40e51405080e98627)
-rwxr-xr-x 1451 git-import.perl
-rwxr-xr-x 724 git-import.sh
-rw-r--r-- 476 git-p4.README
-rwxr-xr-x 11191 import-directories.perl
-rwxr-xr-x 5330 import-tars.perl
-rwxr-xr-x 2241 import-zips.py