Merge branch 'jc/merge-symlink-ours-theirs'
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11817 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 102023 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows