Be more user-friendly when refusing to do something because of conflict.
[gitweb.git] / contrib / fast-import /
drwxr-xr-x   parent (dest: contrib; base: d38a30df7dd54c5c6883af1de1a03ec7d523cee5)
-rwxr-xr-x 1451 git-import.perl
-rwxr-xr-x 724 git-import.sh
-rwxr-xr-x 69568 git-p4
-rw-r--r-- 28 git-p4.bat
-rw-r--r-- 6568 git-p4.txt
-rwxr-xr-x 11189 import-directories.perl
-rwxr-xr-x 5330 import-tars.perl
-rwxr-xr-x 1844 import-zips.py