Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 174f9e622fde6c874ba3d53eb05d0f37d6001ba5)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11723 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 100661 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows