mergetool: Add prompt to continue after failing to merge a file
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: b0169d84df4c09ed7dfcc6aea5aecd177ddda75b)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11490 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 83111 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows