merge-recursive: Consider modifications in rename/rename(2to1) conflicts
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 434b8525e7a68893106f6360ff0a261f03c37512)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11667 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 96857 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows