t6036: add a failed conflict detection case with conflicting types
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 451a3abc262575e5ed325b71547d345c55cc7d1d)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11817 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 102062 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows