merge-recursive: use handle_file_collision for add/add conflicts
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: dcf2815098589b1fa0a01e7a8459c213581d4412)
-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