merge-recursive: do not die on a conflicting submodule
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 0c44c94309693d0582e91a6744edc2e8eba46ef8)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11490 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 85326 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows