Be more user-friendly when refusing to do something because of conflict.
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: d38a30df7dd54c5c6883af1de1a03ec7d523cee5)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11701 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 87128 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows