Be more user-friendly when refusing to do something because of conflict.
[gitweb.git] / contrib / p4import /
drwxr-xr-x   parent (dest: contrib; base: d38a30df7dd54c5c6883af1de1a03ec7d523cee5)
-rw-r--r-- 70 README
-rw-r--r-- 10718 git-p4import.py
-rw-r--r-- 4778 git-p4import.txt