Merge branch 'sp/mergetool'
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 6959893b0b65ebc68ce2fb524a8ec15a26ca4972)
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 5870 Makefile
-rwxr-xr-x 67446 git-gui.sh
drwxr-xr-x - lib