Be more user-friendly when refusing to do something because of conflict.
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: d38a30df7dd54c5c6883af1de1a03ec7d523cee5)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 321008 gitk
drwxr-xr-x - po