Merge branch 'jk/add-p-skip-conflicts'
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 3c524002d67471f8ef5455ef0e5ce3e6fc846b32)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11667 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 98519 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows