Merge branch 'nd/remote-plural-ours-plus-theirs'
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 7a7d0854ff3cb1bc5b95e9295b9c11089d9a75a6)
-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