Merge branch 'jk/error-resolve-conflict-advice'
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: d0d5ba7e6ed1f9ea7b22dc8063b782b431ad37b7)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11664 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 100404 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows