merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-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