merge-recursive: check for directory level conflicts
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 96e7ffbdc31d9e02e2548df5d9a9701e5a83651d)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11817 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 102023 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows